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
6fa4f8c2
Commit
6fa4f8c2
authored
May 07, 2019
by
mdj33
Committed by
vipwzw
May 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix linter
parent
49b19fdd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
12 deletions
+22
-12
docker-compose.sh
build/docker-compose.sh
+2
-1
system-test-rpc.sh
build/system-test-rpc.sh
+7
-5
test-rpc.sh
plugin/dapp/paracross/cmd/build/test-rpc.sh
+12
-6
testcase.sh
plugin/dapp/paracross/cmd/build/testcase.sh
+1
-0
No files found.
build/docker-compose.sh
View file @
6fa4f8c2
...
@@ -57,7 +57,8 @@ if [ -n "${DAPP}" ]; then
...
@@ -57,7 +57,8 @@ if [ -n "${DAPP}" ]; then
fi
fi
if
[
-z
$DAPP
]
;
then
if
[
-z
"
$DAPP
"
]
;
then
# shellcheck source=/dev/null
source
system-test-rpc.sh
source
system-test-rpc.sh
fi
fi
...
...
build/system-test-rpc.sh
View file @
6fa4f8c2
#!/usr/bin/env bash
#!/usr/bin/env bash
# shellcheck disable=SC2128
MAIN_HTTP
=
""
MAIN_HTTP
=
""
MAIN_HTTP
=
""
CASE_ERR
=
""
CASE_ERR
=
""
...
@@ -16,19 +15,18 @@ echo_rst() {
...
@@ -16,19 +15,18 @@ echo_rst() {
}
}
chain33_lock
()
{
chain33_lock
()
{
ok
=
$(
curl
-s
--data-binary
'{"jsonrpc":"2.0","id":2,"method":"Chain33.Lock","params":[]}'
-H
'content-type:text/plain;'
${
MAIN_HTTP
}
| jq
-r
".result.isOK"
)
ok
=
$(
curl
-s
--data-binary
'{"jsonrpc":"2.0","id":2,"method":"Chain33.Lock","params":[]}'
-H
'content-type:text/plain;'
${
MAIN_HTTP
}
| jq
-r
".result.isOK"
)
[
"
$ok
"
==
true
]
[
"
$ok
"
==
true
]
rst
=
$?
rst
=
$?
echo_rst
$FUNCNAME
$rst
echo_rst
"
$FUNCNAME
"
"
$rst
"
}
}
chain33_unlock
()
{
chain33_unlock
()
{
ok
=
$(
curl
-s
--data-binary
'{"jsonrpc":"2.0","id":2,"method":"Chain33.UnLock","params":[{"passwd":"1314fuzamei","timeout":0}]}'
-H
'content-type:text/plain;'
${
MAIN_HTTP
}
| jq
-r
".result.isOK"
)
ok
=
$(
curl
-s
--data-binary
'{"jsonrpc":"2.0","id":2,"method":"Chain33.UnLock","params":[{"passwd":"1314fuzamei","timeout":0}]}'
-H
'content-type:text/plain;'
${
MAIN_HTTP
}
| jq
-r
".result.isOK"
)
[
"
$ok
"
==
true
]
[
"
$ok
"
==
true
]
rst
=
$?
rst
=
$?
echo_rst
$FUNCNAME
$rst
echo_rst
"
$FUNCNAME
"
"
$rst
"
}
}
function
system_test_rpc
()
{
function
system_test_rpc
()
{
...
@@ -36,9 +34,13 @@ function system_test_rpc() {
...
@@ -36,9 +34,13 @@ function system_test_rpc() {
MAIN_HTTP
=
"http://
$ip
:8801"
MAIN_HTTP
=
"http://
$ip
:8801"
echo
"=========== # system rpc test ============="
echo
"=========== # system rpc test ============="
echo
"ip=
$MAIN_HTTP
"
echo
"ip=
$MAIN_HTTP
"
chain33_lock
chain33_lock
chain33_unlock
chain33_unlock
if
[
-n
"
$CASE_ERR
"
]
;
then
if
[
-n
"
$CASE_ERR
"
]
;
then
echo
"there some case error"
echo
"there some case error"
exit
1
exit
1
...
...
plugin/dapp/paracross/cmd/build/test-rpc.sh
View file @
6fa4f8c2
#!/usr/bin/env bash
#!/usr/bin/env bash
# shellcheck disable=SC2128
MAIN_HTTP
=
""
MAIN_HTTP
=
""
PARA_HTTP
=
""
CASE_ERR
=
""
CASE_ERR
=
""
# $2=0 means true, other false
# $2=0 means true, other false
...
@@ -15,35 +17,39 @@ echo_rst() {
...
@@ -15,35 +17,39 @@ echo_rst() {
}
}
paracross_GetBlock2MainInfo
()
{
paracross_GetBlock2MainInfo
()
{
height
=
$(
curl
-s
--data-binary
'{"jsonrpc":"2.0","id":2,"method":"paracross.GetBlock2MainInfo","params":[{"start":1,"end":3}]}'
-H
'content-type:text/plain;'
${
MAIN
_HTTP
}
| jq
-r
".result.items[1].height"
)
height
=
$(
curl
-s
--data-binary
'{"jsonrpc":"2.0","id":2,"method":"paracross.GetBlock2MainInfo","params":[{"start":1,"end":3}]}'
-H
'content-type:text/plain;'
${
PARA
_HTTP
}
| jq
-r
".result.items[1].height"
)
[
"
$height
"
-eq
2
]
[
"
$height
"
-eq
2
]
rst
=
$?
rst
=
$?
echo_rst
$FUNCNAME
$rst
echo_rst
"
$FUNCNAME
"
"
$rst
"
}
}
chain33_lock
()
{
chain33_lock
()
{
ok
=
$(
curl
-s
--data-binary
'{"jsonrpc":"2.0","id":2,"method":"Chain33.Lock","params":[]}'
-H
'content-type:text/plain;'
${
MAIN_HTTP
}
| jq
-r
".result.isOK"
)
ok
=
$(
curl
-s
--data-binary
'{"jsonrpc":"2.0","id":2,"method":"Chain33.Lock","params":[]}'
-H
'content-type:text/plain;'
${
MAIN_HTTP
}
| jq
-r
".result.isOK"
)
[
"
$ok
"
==
true
]
[
"
$ok
"
==
true
]
rst
=
$?
rst
=
$?
echo_rst
$FUNCNAME
$rst
echo_rst
"
$FUNCNAME
"
"
$rst
"
}
}
chain33_unlock
()
{
chain33_unlock
()
{
ok
=
$(
curl
-s
--data-binary
'{"jsonrpc":"2.0","id":2,"method":"Chain33.UnLock","params":[{"passwd":"1314fuzamei","timeout":0}]}'
-H
'content-type:text/plain;'
${
MAIN_HTTP
}
| jq
-r
".result.isOK"
)
ok
=
$(
curl
-s
--data-binary
'{"jsonrpc":"2.0","id":2,"method":"Chain33.UnLock","params":[{"passwd":"1314fuzamei","timeout":0}]}'
-H
'content-type:text/plain;'
${
MAIN_HTTP
}
| jq
-r
".result.isOK"
)
[
"
$ok
"
==
true
]
[
"
$ok
"
==
true
]
rst
=
$?
rst
=
$?
echo_rst
$FUNCNAME
$rst
echo_rst
"
$FUNCNAME
"
"
$rst
"
}
}
function
dapp_rpc_test
()
{
function
dapp_rpc_test
()
{
local
ip
=
$1
local
ip
=
$1
MAIN_HTTP
=
"http://
$ip
:8901"
MAIN_HTTP
=
"http://
$ip
:8801"
PARA_HTTP
=
"http://
$ip
:8901"
echo
"=========== # paracross rpc test ============="
echo
"=========== # paracross rpc test ============="
echo
"ip=
$MAIN_HTTP
"
echo
"main_ip=
$MAIN_HTTP
,para_ip=
$PARA_HTTP
"
chain33_lock
chain33_lock
chain33_unlock
chain33_unlock
paracross_GetBlock2MainInfo
paracross_GetBlock2MainInfo
if
[
-n
"
$CASE_ERR
"
]
;
then
if
[
-n
"
$CASE_ERR
"
]
;
then
echo
"paracross there some case error"
echo
"paracross there some case error"
exit
1
exit
1
...
...
plugin/dapp/paracross/cmd/build/testcase.sh
View file @
6fa4f8c2
...
@@ -14,6 +14,7 @@ if [ "$(uname)" == "Darwin" ]; then
...
@@ -14,6 +14,7 @@ if [ "$(uname)" == "Darwin" ]; then
xsedfix
=
".bak"
xsedfix
=
".bak"
fi
fi
# shellcheck source=/dev/null
source
test-rpc.sh
source
test-rpc.sh
function
para_init
()
{
function
para_init
()
{
...
...
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