删除toml，从chain33中修改testnode.cfg

plugin/dapp/js/executor/rpc_test.go

@@ -25,7 +25,9 @@ func init() {
 }
 
 func TestJsVM(t *testing.T) {
-	mocker := testnode.New("testdata/chain33.cfg.toml", nil)
+	cfg, sub := testnode.GetDefaultConfig()
+	cfg.Consensus.Name = "ticket"
+	mocker := testnode.NewWithConfig(cfg, sub, nil)
 	defer mocker.Close()
 	mocker.Listen()
 

plugin/dapp/js/executor/testdata/chain33.cfg.toml

-Title="local"
-TestNet=true
-FixTime=false
-
-[log]
-# 日志级别，支持debug(dbug)/info/warn/error(eror)/crit
-loglevel = "debug"
-logConsoleLevel = "info"
-# 日志文件名，可带目录，所有生成的日志文件都放到此目录下
-logFile = "logs/chain33.log"
-# 单个日志文件的最大值（单位：兆）
-maxFileSize = 300
-# 最多保存的历史日志文件个数
-maxBackups = 100
-# 最多保存的历史日志消息（单位：天）
-maxAge = 28
-# 日志文件名是否使用本地事件（否则使用UTC时间）
-localTime = true
-# 历史日志文件是否压缩（压缩格式为gz）
-compress = true
-# 是否打印调用源文件和行号
-callerFile = false
-# 是否打印调用方法
-callerFunction = false
-
-[blockchain]
-defCacheSize=128
-maxFetchBlockNum=128
-timeoutSeconds=5
-batchBlockNum=128
-driver="memdb"
-dbPath="datadir"
-dbCache=64
-isStrongConsistency=false
-singleMode=true
-batchsync=false
-isRecordBlockSequence=true
-isParaChain=false
-enableTxQuickIndex=false
-
-[p2p]
-seeds=[]
-enable=false
-isSeed=false
-serverStart=true
-innerSeedEnable=true
-useGithub=true
-innerBounds=300
-msgCacheSize=10240
-driver="memdb"
-dbPath="datadir/addrbook"
-dbCache=4
-grpcLogFile="grpc33.log"
-
-[rpc]
-jrpcBindAddr="localhost:0"
-grpcBindAddr="localhost:0"
-whitelist=["127.0.0.1"]
-jrpcFuncWhitelist=["*"]
-grpcFuncWhitelist=["*"]
-
-[mempool]
-name="timeline"
-poolCacheSize=10240
-minTxFee=100000
-maxTxNumPerAccount=10000
-
-[consensus]
-name="ticket"
-minerstart=true
-genesisBlockTime=1514533394
-genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
-minerExecs=["ticket", "autonomy"]
-
-[mver.consensus]
-fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
-coinReward = 18
-coinDevFund = 12
-ticketPrice = 10000
-powLimitBits = "0x1f00ffff"
-retargetAdjustmentFactor = 4
-futureBlockTime = 16
-ticketFrozenTime = 5
-ticketWithdrawTime = 10
-ticketMinerWaitTime = 2
-maxTxNumber = 1600
-targetTimespan = 2304
-targetTimePerBlock = 16
-
-[mver.consensus.ForkChainParamV1]
-maxTxNumber = 10000
-targetTimespan = 288 #only for test
-targetTimePerBlock = 2
-
-[mver.consensus.ForkChainParamV2]
-powLimitBits = "0x1f2fffff"
-
-[mver.consensus.ForkTicketFundAddrV1]
-fundKeyAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
-
-[consensus.sub.solo]
-genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
-genesisBlockTime=1514533394
-waitTxMs=10
-
-[consensus.sub.ticket]
-genesisBlockTime=1514533394
-[[consensus.sub.ticket.genesis]]
-minerAddr="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
-returnAddr="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
-count=10000
-
-[[consensus.sub.ticket.genesis]]
-minerAddr="1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"
-returnAddr="1EbDHAXpoiewjPLX9uqoz38HsKqMXayZrF"
-count=100
-
-[[consensus.sub.ticket.genesis]]
-minerAddr="1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX"
-returnAddr="1KcCVZLSQYRUwE5EXTsAoQs9LuJW6xwfQa"
-count=100
-
-[store]
-name="mavl"
-driver="memdb"
-dbPath="datadir/mavltree"
-dbCache=128
-
-[store.sub.mavl]
-enableMavlPrefix=false
-enableMVCC=false
-
-[wallet]
-minFee=100000
-driver="memdb"
-dbPath="wallet"
-dbCache=16
-signType="secp256k1"
-
-[wallet.sub.ticket]
-minerdisable=false
-minerwhitelist=["*"]
-minerWaitTime="1s"
-
-[exec]
-isFree=false
-minExecFee=100000
-enableStat=false
-enableMVCC=false
-alias=["token1:token","token2:token","token3:token"]
-
-[exec.sub.token]
-saveTokenTxList=true
-tokenApprs = [
-	"1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S",
-	"1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK",
-	"1LY8GFia5EiyoTodMLfkB5PHNNpXRqxhyB",
-	"1GCzJDS6HbgTQ2emade7mEJGGWFfA15pS9",
-	"1JYB8sxi4He5pZWHCd3Zi2nypQ4JMB6AxN",
-	"12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",
-]
-
-[exec.sub.relay]
-genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
-
-[exec.sub.cert]
-# 是否启用证书验证和签名
-enable=false
-# 加密文件路径
-cryptoPath="authdir/crypto"
-# 带证书签名类型，支持"auth_ecdsa", "auth_sm2"
-signType="auth_ecdsa"
-
-[exec.sub.manage]
-superManager=[
-    "1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S", 
-    "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv", 
-    "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
-]
-
-[exec.sub.autonomy]
-total="16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp"
-useBalance=false
\ No newline at end of file

plugin/dapp/ticket/executor/testdata/chain33.cfg.toml

@@ -212,7 +212,7 @@ ForkBlockCheck=-1 #fork 6.2
 ForkBase58AddressCheck=-1 #fork6.2
 ForkEnableParaRegExec=0
 ForkCacheDriver=0
-ForkTicketFundAddrV1=0 #fork6.3
+ForkTicketFundAddrV1=-1 #fork6.3
 [fork.sub.coins]
 Enable=0
 [fork.sub.ticket]

plugin/dapp/ticket/wallet/testdata/chain33.cfg.toml

-Title="local"
-TestNet=true
-FixTime=false
-
-[log]
-# 日志级别，支持debug(dbug)/info/warn/error(eror)/crit
-loglevel = "debug"
-logConsoleLevel = "info"
-# 日志文件名，可带目录，所有生成的日志文件都放到此目录下
-logFile = "logs/chain33.log"
-# 单个日志文件的最大值（单位：兆）
-maxFileSize = 300
-# 最多保存的历史日志文件个数
-maxBackups = 100
-# 最多保存的历史日志消息（单位：天）
-maxAge = 28
-# 日志文件名是否使用本地事件（否则使用UTC时间）
-localTime = true
-# 历史日志文件是否压缩（压缩格式为gz）
-compress = true
-# 是否打印调用源文件和行号
-callerFile = false
-# 是否打印调用方法
-callerFunction = false
-
-[blockchain]
-defCacheSize=128
-maxFetchBlockNum=128
-timeoutSeconds=5
-batchBlockNum=128
-driver="memdb"
-dbPath="datadir"
-dbCache=64
-isStrongConsistency=false
-singleMode=true
-batchsync=false
-isRecordBlockSequence=true
-isParaChain=false
-enableTxQuickIndex=false
-
-[p2p]
-seeds=[]
-enable=false
-isSeed=false
-serverStart=true
-innerSeedEnable=true
-useGithub=true
-innerBounds=300
-msgCacheSize=10240
-driver="memdb"
-dbPath="datadir/addrbook"
-dbCache=4
-grpcLogFile="grpc33.log"
-
-[rpc]
-jrpcBindAddr="localhost:0"
-grpcBindAddr="localhost:0"
-whitelist=["127.0.0.1"]
-jrpcFuncWhitelist=["*"]
-grpcFuncWhitelist=["*"]
-
-[mempool]
-name="timeline"
-poolCacheSize=10240
-minTxFee=100000
-maxTxNumPerAccount=10000
-
-[consensus]
-name="ticket"
-minerstart=true
-genesisBlockTime=1514533394
-genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
-minerExecs=["ticket", "autonomy"]
-
-[mver.consensus]
-fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
-coinReward = 18
-coinDevFund = 12
-ticketPrice = 10000
-powLimitBits = "0x1f00ffff"
-retargetAdjustmentFactor = 4
-futureBlockTime = 16
-ticketFrozenTime = 5
-ticketWithdrawTime = 10
-ticketMinerWaitTime = 2
-maxTxNumber = 1600
-targetTimespan = 2304
-targetTimePerBlock = 16
-
-[mver.consensus.ForkChainParamV1]
-maxTxNumber = 10000
-targetTimespan = 288 #only for test
-targetTimePerBlock = 2
-
-[mver.consensus.ForkChainParamV2]
-powLimitBits = "0x1f2fffff"
-
-[mver.consensus.ForkTicketFundAddrV1]
-fundKeyAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
-
-[consensus.sub.solo]
-genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
-genesisBlockTime=1514533394
-waitTxMs=10
-
-[consensus.sub.ticket]
-genesisBlockTime=1514533394
-[[consensus.sub.ticket.genesis]]
-minerAddr="12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
-returnAddr="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
-count=10000
-
-[[consensus.sub.ticket.genesis]]
-minerAddr="1PUiGcbsccfxW3zuvHXZBJfznziph5miAo"
-returnAddr="1EbDHAXpoiewjPLX9uqoz38HsKqMXayZrF"
-count=100
-
-[[consensus.sub.ticket.genesis]]
-minerAddr="1EDnnePAZN48aC2hiTDzhkczfF39g1pZZX"
-returnAddr="1KcCVZLSQYRUwE5EXTsAoQs9LuJW6xwfQa"
-count=100
-
-[store]
-name="mavl"
-driver="memdb"
-dbPath="datadir/mavltree"
-dbCache=128
-
-[store.sub.mavl]
-enableMavlPrefix=false
-enableMVCC=false
-
-[wallet]
-minFee=100000
-driver="memdb"
-dbPath="wallet"
-dbCache=16
-signType="secp256k1"
-
-[wallet.sub.ticket]
-minerdisable=false
-minerwhitelist=["*"]
-minerWaitTime="1s"
-
-[exec]
-isFree=false
-minExecFee=100000
-enableStat=false
-enableMVCC=false
-alias=["token1:token","token2:token","token3:token"]
-
-[exec.sub.token]
-saveTokenTxList=true
-tokenApprs = [
-	"1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S",
-	"1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK",
-	"1LY8GFia5EiyoTodMLfkB5PHNNpXRqxhyB",
-	"1GCzJDS6HbgTQ2emade7mEJGGWFfA15pS9",
-	"1JYB8sxi4He5pZWHCd3Zi2nypQ4JMB6AxN",
-	"12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv",
-]
-
-[exec.sub.relay]
-genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
-
-[exec.sub.cert]
-# 是否启用证书验证和签名
-enable=false
-# 加密文件路径
-cryptoPath="authdir/crypto"
-# 带证书签名类型，支持"auth_ecdsa", "auth_sm2"
-signType="auth_ecdsa"
-
-[exec.sub.manage]
-superManager=[
-    "1Bsg9j6gW83sShoee1fZAt9TkUjcrCgA9S", 
-    "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv", 
-    "1Q8hGLfoGe63efeWa8fJ4Pnukhkngt6poK"
-]
-
-[exec.sub.autonomy]
-total="16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp"
-useBalance=false
\ No newline at end of file

plugin/dapp/ticket/wallet/ticket_test.go

@@ -22,7 +22,9 @@ func Test_WalletTicket(t *testing.T) {
 	minerAddr := "12qyocayNF7Lv6C9qW4avxs2E7U41fKSfv"
 	t.Log("Begin wallet ticket test")
 
-	mock33 := testnode.New("testdata/chain33.cfg.toml", nil)
+	cfg, sub := testnode.GetDefaultConfig()
+	cfg.Consensus.Name = "ticket"
+	mock33 := testnode.NewWithConfig(cfg, sub, nil)
 	defer mock33.Close()
 	err := mock33.WaitHeight(0)
 	assert.Nil(t, err)