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
de910c58
Commit
de910c58
authored
Jul 21, 2021
by
mdj33
Committed by
vipwzw
Jul 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix ut
parent
579d4019
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
coinsx.go
plugin/dapp/coinsx/commands/coinsx.go
+2
-2
exec_cli.go
plugin/dapp/exchange/test/exec_cli.go
+3
-2
testcase.sh
plugin/dapp/paracross/cmd/build/testcase.sh
+1
-1
chain33.cfg.toml
plugin/dapp/ticket/executor/testdata/chain33.cfg.toml
+1
-2
No files found.
plugin/dapp/coinsx/commands/coinsx.go
View file @
de910c58
...
...
@@ -62,7 +62,7 @@ func createTransferFlagTx(cmd *cobra.Command, args []string) {
config
:=
&
coinsTy
.
CoinsConfig
{}
config
.
Ty
=
coinsTy
.
ConfigType_TRANSFER
config
.
Value
=
&
coinsTy
.
CoinsConfig_TransferFlag
{
&
coinsTy
.
TransferFlagConfig
{
Flag
:
coinsTy
.
TransferFlag
(
flag
)}}
config
.
Value
=
&
coinsTy
.
CoinsConfig_TransferFlag
{
TransferFlag
:
&
coinsTy
.
TransferFlagConfig
{
Flag
:
coinsTy
.
TransferFlag
(
flag
)}}
params
:=
&
rpctypes
.
CreateTxIn
{
Execer
:
getRealExecName
(
paraName
,
coinsTy
.
CoinsxX
),
...
...
@@ -101,7 +101,7 @@ func createManageAccountsTx(cmd *cobra.Command, args []string) {
config
:=
&
coinsTy
.
CoinsConfig
{}
config
.
Ty
=
coinsTy
.
ConfigType_ACCOUNTS
config
.
Value
=
&
coinsTy
.
CoinsConfig_ManagerAccounts
{
&
coinsTy
.
ManagerAccountsConfig
{
ManagerAccounts
:
&
coinsTy
.
ManagerAccountsConfig
{
Op
:
coinsTy
.
AccountOp
(
op
),
Accounts
:
accounts
,
},
...
...
plugin/dapp/exchange/test/exec_cli.go
View file @
de910c58
...
...
@@ -147,7 +147,9 @@ func (c *ExecCli) Send(tx *types.Transaction, hexKey string) ([]*types.ReceiptLo
return
nil
,
err
}
api
,
_
:=
client
.
New
(
c
.
q
.
Client
(),
nil
)
exec
:=
executor
.
NewExchange
()
exec
.
SetAPI
(
api
)
if
err
:=
exec
.
CheckTx
(
tx
,
int
(
1
));
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -155,8 +157,7 @@ func (c *ExecCli) Send(tx *types.Transaction, hexKey string) ([]*types.ReceiptLo
c
.
height
++
c
.
blockTime
+=
10
c
.
difficulty
++
api
,
_
:=
client
.
New
(
c
.
q
.
Client
(),
nil
)
exec
.
SetAPI
(
api
)
exec
.
SetStateDB
(
c
.
sdb
)
exec
.
SetLocalDB
(
c
.
ldb
)
exec
.
SetEnv
(
c
.
height
,
c
.
blockTime
,
c
.
difficulty
)
...
...
plugin/dapp/paracross/cmd/build/testcase.sh
View file @
de910c58
...
...
@@ -74,7 +74,7 @@ function para_set_toml() {
sed
-i
$xsedfix
's/^whitelist=.*/whitelist=["localhost","127.0.0.1","0.0.0.0"]/g'
"
${
1
}
"
sed
-i
$xsedfix
's/^ParaRemoteGrpcClient=.*/ParaRemoteGrpcClient="nginx:8803"/g'
"
${
1
}
"
sed
-i
$xsedfix
's/^genesis="1
JmFaA6unrCFYEWP
.*/genesis="1G5Cjy8LuQex2fuYv3gzb7B8MxAnxLEqt3"/g'
"
${
1
}
"
sed
-i
$xsedfix
's/^genesis="1
2qyocayNF7Lv6C9qW4avxs2E7
.*/genesis="1G5Cjy8LuQex2fuYv3gzb7B8MxAnxLEqt3"/g'
"
${
1
}
"
# shellcheck disable=SC1004
sed
-i
$xsedfix
's/^superManager=.*/superManager=["1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S",\
"12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",\
...
...
plugin/dapp/ticket/executor/testdata/chain33.cfg.toml
View file @
de910c58
...
...
@@ -219,8 +219,7 @@ ForkTicketFundAddrV1=-1 #fork6.3
ForkRootHash
=
1
[fork.sub.coins]
Enable
=
0
[fork.sub.coinsx]
Enable
=
0
[fork.sub.ticket]
Enable
=
0
ForkTicketId
=
1600000
...
...
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