modify test

chain33.para.toml

@@ -80,7 +80,6 @@ minerExecs=["paracross"]    #配置挖矿合约
 
 [mver.consensus]
 fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
-autonomyFundAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
 coinReward = 18
 coinDevFund = 12
 ticketPrice = 10000

chain33.toml

@@ -90,7 +90,6 @@ minerExecs=["ticket", "autonomy"]
 
 [mver.consensus]
 fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
-autonomyFundAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
 coinReward = 18
 coinDevFund = 12
 ticketPrice = 10000
@@ -120,6 +119,9 @@ targetTimespan = 720
 targetTimePerBlock = 5
 ticketPrice = 3000
 
+[mver.consensus.ForkTicketFundAddrV1]
+fundKeyAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
+
 [consensus.sub.ticket]
 genesisBlockTime=1514533394
 [[consensus.sub.ticket.genesis]]

plugin/consensus/ticket/testdata/chain33.cfg.toml

-Title="local"
+Title="chain33"
 TestNet=true
 FixTime=false
 
@@ -74,7 +74,6 @@ minerExecs=["ticket", "autonomy"]
 
 [mver.consensus]
 fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
-autonomyFundAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
 coinReward = 18
 coinDevFund = 12
 ticketPrice = 10000
@@ -96,6 +95,9 @@ targetTimePerBlock = 2
 [mver.consensus.ForkChainParamV2]
 powLimitBits = "0x1f2fffff"
 
+[mver.consensus.ForkTicketFundAddrV1]
+fundKeyAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
+
 [consensus.sub.solo]
 genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
 genesisBlockTime=1514533394

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

@@ -74,7 +74,6 @@ minerExecs=["ticket", "autonomy"]
 
 [mver.consensus]
 fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
-autonomyFundAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
 coinReward = 18
 coinDevFund = 12
 ticketPrice = 10000
@@ -102,6 +101,9 @@ targetTimespan = 720
 targetTimePerBlock = 1
 powLimitBits = "0x1f2fffff"
 
+[mver.consensus.ForkTicketFundAddrV1]
+fundKeyAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
+
 [consensus.sub.solo]
 genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
 genesisBlockTime=1514533394

plugin/dapp/ticket/executor/ticketdb.go

@@ -343,7 +343,7 @@ func (action *Action) TicketMiner(miner *ty.TicketMiner, index int) (*types.Rece
 	var receipt2 *types.Receipt
 	if types.IsFork(action.height, "ForkTicketFundAddrV1") {
 		// issue coins to exec addr
-		addr := types.MGStr("mver.consensus.autonomyFundAddr", 0)
+		addr := types.GetFundAddr()
 		receipt2, err = action.coinsAccount.ExecIssueCoins(addr, cfg.CoinDevFund)
 		if err != nil {
 			tlog.Error("TicketMiner.ExecDepositFrozen fund to autonomy fund", "addr", addr)

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

@@ -74,7 +74,6 @@ minerExecs=["ticket", "autonomy"]
 
 [mver.consensus]
 fundKeyAddr = "1BQXS6TxaYYG5mADaWij4AxhZZUTpw95a5"
-autonomyFundAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
 coinReward = 18
 coinDevFund = 12
 ticketPrice = 10000
@@ -96,6 +95,9 @@ targetTimePerBlock = 2
 [mver.consensus.ForkChainParamV2]
 powLimitBits = "0x1f2fffff"
 
+[mver.consensus.ForkTicketFundAddrV1]
+fundKeyAddr = "1Ji3W12KGScCM7C2p8bg635sNkayDM8MGY"
+
 [consensus.sub.solo]
 genesis="14KEKbYtKKQm4wMthSK9J4La4nAiidGozt"
 genesisBlockTime=1514533394

plugin/dapp/token/executor/exec.go

@@ -46,13 +46,7 @@ func (t *token) Exec_TokenPreCreate(payload *tokenty.TokenPreCreate, tx *types.T
 }
 
 func (t *token) Exec_TokenFinishCreate(payload *tokenty.TokenFinishCreate, tx *types.Transaction, index int) (*types.Receipt, error) {
-	fundAddr := ""
-	if types.IsFork(t.GetHeight(), "ForkTicketFundAddrV1") {
-		fundAddr = types.MGStr("mver.consensus.autonomyFundAddr", 0)
-	} else {
-		fundAddr = types.GetFundAddr()
-	}
-	action := newTokenAction(t, fundAddr, tx)
+	action := newTokenAction(t, types.GetFundAddr(), tx)
 	return action.finishCreate(payload)
 }