Commit de910c58 authored by mdj33's avatar mdj33 Committed by vipwzw

fix ut

parent 579d4019
...@@ -62,7 +62,7 @@ func createTransferFlagTx(cmd *cobra.Command, args []string) { ...@@ -62,7 +62,7 @@ func createTransferFlagTx(cmd *cobra.Command, args []string) {
config := &coinsTy.CoinsConfig{} config := &coinsTy.CoinsConfig{}
config.Ty = coinsTy.ConfigType_TRANSFER 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{ params := &rpctypes.CreateTxIn{
Execer: getRealExecName(paraName, coinsTy.CoinsxX), Execer: getRealExecName(paraName, coinsTy.CoinsxX),
...@@ -101,7 +101,7 @@ func createManageAccountsTx(cmd *cobra.Command, args []string) { ...@@ -101,7 +101,7 @@ func createManageAccountsTx(cmd *cobra.Command, args []string) {
config := &coinsTy.CoinsConfig{} config := &coinsTy.CoinsConfig{}
config.Ty = coinsTy.ConfigType_ACCOUNTS config.Ty = coinsTy.ConfigType_ACCOUNTS
config.Value = &coinsTy.CoinsConfig_ManagerAccounts{ config.Value = &coinsTy.CoinsConfig_ManagerAccounts{
&coinsTy.ManagerAccountsConfig{ ManagerAccounts: &coinsTy.ManagerAccountsConfig{
Op: coinsTy.AccountOp(op), Op: coinsTy.AccountOp(op),
Accounts: accounts, Accounts: accounts,
}, },
......
...@@ -147,7 +147,9 @@ func (c *ExecCli) Send(tx *types.Transaction, hexKey string) ([]*types.ReceiptLo ...@@ -147,7 +147,9 @@ func (c *ExecCli) Send(tx *types.Transaction, hexKey string) ([]*types.ReceiptLo
return nil, err return nil, err
} }
api, _ := client.New(c.q.Client(), nil)
exec := executor.NewExchange() exec := executor.NewExchange()
exec.SetAPI(api)
if err := exec.CheckTx(tx, int(1)); err != nil { if err := exec.CheckTx(tx, int(1)); err != nil {
return nil, err return nil, err
} }
...@@ -155,8 +157,7 @@ func (c *ExecCli) Send(tx *types.Transaction, hexKey string) ([]*types.ReceiptLo ...@@ -155,8 +157,7 @@ func (c *ExecCli) Send(tx *types.Transaction, hexKey string) ([]*types.ReceiptLo
c.height++ c.height++
c.blockTime += 10 c.blockTime += 10
c.difficulty++ c.difficulty++
api, _ := client.New(c.q.Client(), nil)
exec.SetAPI(api)
exec.SetStateDB(c.sdb) exec.SetStateDB(c.sdb)
exec.SetLocalDB(c.ldb) exec.SetLocalDB(c.ldb)
exec.SetEnv(c.height, c.blockTime, c.difficulty) exec.SetEnv(c.height, c.blockTime, c.difficulty)
......
...@@ -74,7 +74,7 @@ function para_set_toml() { ...@@ -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/^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/^ParaRemoteGrpcClient=.*/ParaRemoteGrpcClient="nginx:8803"/g' "${1}"
sed -i $xsedfix 's/^genesis="1JmFaA6unrCFYEWP.*/genesis="1G5Cjy8LuQex2fuYv3gzb7B8MxAnxLEqt3"/g' "${1}" sed -i $xsedfix 's/^genesis="12qyocayNF7Lv6C9qW4avxs2E7.*/genesis="1G5Cjy8LuQex2fuYv3gzb7B8MxAnxLEqt3"/g' "${1}"
# shellcheck disable=SC1004 # shellcheck disable=SC1004
sed -i $xsedfix 's/^superManager=.*/superManager=["1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S",\ sed -i $xsedfix 's/^superManager=.*/superManager=["1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S",\
"12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",\ "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",\
......
...@@ -219,8 +219,7 @@ ForkTicketFundAddrV1=-1 #fork6.3 ...@@ -219,8 +219,7 @@ ForkTicketFundAddrV1=-1 #fork6.3
ForkRootHash =1 ForkRootHash =1
[fork.sub.coins] [fork.sub.coins]
Enable=0 Enable=0
[fork.sub.coinsx]
Enable=0
[fork.sub.ticket] [fork.sub.ticket]
Enable=0 Enable=0
ForkTicketId = 1600000 ForkTicketId = 1600000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment