Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
33fc3431
Commit
33fc3431
authored
Mar 13, 2019
by
mdj33
Committed by
33cn
Mar 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rmv relay from ci temperary
parent
a08dac94
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
21 deletions
+7
-21
Makefile
plugin/dapp/js/cmd/Makefile
+0
-4
build.sh
plugin/dapp/js/cmd/build.sh
+0
-11
js.go
plugin/dapp/js/command/js.go
+1
-1
plugin.go
plugin/dapp/js/plugin.go
+2
-2
build.sh
plugin/dapp/relay/cmd/build.sh
+3
-3
testcase.sh
plugin/dapp/relay/cmd/build/testcase.sh
+1
-0
No files found.
plugin/dapp/js/cmd/Makefile
deleted
100644 → 0
View file @
a08dac94
all
:
chmod
+x ./build.sh
./build.sh
$(OUT)
$(FLAG)
\ No newline at end of file
plugin/dapp/js/cmd/build.sh
deleted
100755 → 0
View file @
a08dac94
#!/bin/sh
strpwd
=
$(
pwd
)
strcmd
=
${
strpwd
##*dapp/
}
strapp
=
${
strcmd
%/cmd*
}
OUT_DIR
=
"
${
1
}
/
$strapp
"
#FLAG=$2
mkdir
-p
"
${
OUT_DIR
}
"
cp
./build/
*
"
${
OUT_DIR
}
"
plugin/dapp/js/c
m
d/js.go
→
plugin/dapp/js/c
omman
d/js.go
View file @
33fc3431
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// license that can be found in the LICENSE file.
package
c
m
d
package
c
omman
d
import
(
import
(
"fmt"
"fmt"
...
...
plugin/dapp/js/plugin.go
View file @
33fc3431
...
@@ -2,12 +2,12 @@ package js
...
@@ -2,12 +2,12 @@ package js
import
(
import
(
"github.com/33cn/chain33/pluginmgr"
"github.com/33cn/chain33/pluginmgr"
"github.com/33cn/plugin/plugin/dapp/js/cmd"
"github.com/33cn/plugin/plugin/dapp/js/executor"
"github.com/33cn/plugin/plugin/dapp/js/executor"
ptypes
"github.com/33cn/plugin/plugin/dapp/js/types"
ptypes
"github.com/33cn/plugin/plugin/dapp/js/types"
// init auto test
// init auto test
_
"github.com/33cn/plugin/plugin/dapp/js/autotest"
_
"github.com/33cn/plugin/plugin/dapp/js/autotest"
"github.com/33cn/plugin/plugin/dapp/js/command"
)
)
func
init
()
{
func
init
()
{
...
@@ -15,7 +15,7 @@ func init() {
...
@@ -15,7 +15,7 @@ func init() {
Name
:
ptypes
.
JsX
,
Name
:
ptypes
.
JsX
,
ExecName
:
executor
.
GetName
(),
ExecName
:
executor
.
GetName
(),
Exec
:
executor
.
Init
,
Exec
:
executor
.
Init
,
Cmd
:
c
m
d
.
JavaScriptCmd
,
Cmd
:
c
omman
d
.
JavaScriptCmd
,
RPC
:
nil
,
RPC
:
nil
,
})
})
}
}
plugin/dapp/relay/cmd/build.sh
View file @
33fc3431
...
@@ -9,6 +9,6 @@ SRC_RELAYD=github.com/33cn/plugin/plugin/dapp/relay/cmd/relayd
...
@@ -9,6 +9,6 @@ SRC_RELAYD=github.com/33cn/plugin/plugin/dapp/relay/cmd/relayd
FLAG
=
$2
FLAG
=
$2
# shellcheck disable=SC2086
# shellcheck disable=SC2086
go build
-i
${
FLAG
}
-v
-o
"
${
OUT_DIR
}
/relayd"
"
${
SRC_RELAYD
}
"
#
go build -i ${FLAG} -v -o "${OUT_DIR}/relayd" "${SRC_RELAYD}"
cp
./relayd/relayd.toml
"
${
OUT_DIR
}
/relayd.toml"
#
cp ./relayd/relayd.toml "${OUT_DIR}/relayd.toml"
cp
./build/
*
"
${
OUT_DIR
}
"
#
cp ./build/* "${OUT_DIR}"
plugin/dapp/relay/cmd/build/testcase.sh
View file @
33fc3431
...
@@ -170,6 +170,7 @@ function relay_test() {
...
@@ -170,6 +170,7 @@ function relay_test() {
coinaddr
=
$(${
1
}
tx query
-s
"
${
buy_hash
}
"
| jq
-r
".receipt.logs[2].log.coinAddr"
)
coinaddr
=
$(${
1
}
tx query
-s
"
${
buy_hash
}
"
| jq
-r
".receipt.logs[2].log.coinAddr"
)
if
[
"
${
coinaddr
}
"
!=
"1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT"
]
;
then
if
[
"
${
coinaddr
}
"
!=
"1Am9UTGfdnxabvcywYG2hvzr6qK8T3oUZT"
]
;
then
${
1
}
tx query
-s
"
${
buy_hash
}
"
echo
"wrong create order to coinaddr"
echo
"wrong create order to coinaddr"
exit
1
exit
1
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment