Commit 58fdecea authored by duanjinfei's avatar duanjinfei

six commit

parent ccaf3350
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"goRoutine": 1, "goRoutine": 1,
"generateAccCount": 500, "generateAccCount": 500,
"isDeployContract": false, "isDeployContract": false,
"isInitAccountBalance": false, "isInitAccountBalance": true,
"startTokenId": 1, "startTokenId": 1,
"endTokenId": 100, "endTokenId": 100,
"transferType": [] "transferType": []
......
...@@ -285,22 +285,22 @@ func InitCaseAccount(client *ethclient.Client, txArr []*types.Transaction) []*ty ...@@ -285,22 +285,22 @@ func InitCaseAccount(client *ethclient.Client, txArr []*types.Transaction) []*ty
auth.NoSend = true auth.NoSend = true
amount := big.NewInt(0) amount := big.NewInt(0)
amount.SetString("10000000000000000000", 10) amount.SetString("10000000000000000000", 10)
trade := &coin.Trade{ //trade := &coin.Trade{
FromPrv: tool.Cfg.DeployPrv, // FromPrv: tool.Cfg.DeployPrv,
FromNonce: big.NewInt(int64(nonce)), // FromNonce: big.NewInt(int64(nonce)),
Amount: amount, // Amount: amount,
Gas: big.NewInt(50000), // Gas: big.NewInt(50000),
GasPrice: big.NewInt(1000000000), // GasPrice: big.NewInt(1000000000),
ChainId: tool.Cfg.ChainId, // ChainId: tool.Cfg.ChainId,
} //}
contractMap := tool.ParseContractConfig("./config/contractConfig.json") contractMap := tool.ParseContractConfig("./config/contractConfig.json")
contractLen := len(contractMap) contractLen := len(contractMap)
//初始化From账户-500tx //初始化From账户-500tx
coinTxArr, nonce := InitAccountCoin(txArr, nonce, amount, accArr) //coinTxArr, nonce := InitAccountCoin(txArr, nonce, amount, accArr)
txArr = append(txArr, coinTxArr...) //txArr = append(txArr, coinTxArr...)
//初始化转账合约账户余额-10tx //初始化转账合约账户余额-10tx
contractCoinTxArr, nonce := InitContractCoin(txArr, nonce, contractLen, contractMap, trade) //contractCoinTxArr, nonce := InitContractCoin(txArr, nonce, contractLen, contractMap, trade)
txArr = append(txArr, contractCoinTxArr...) //txArr = append(txArr, contractCoinTxArr...)
//// 初始化erc20 并且mint //// 初始化erc20 并且mint
erc20TxArr, nonce := InitErc20Acc(txArr, nonce, contractLen, contractMap, accArr, client, auth) erc20TxArr, nonce := InitErc20Acc(txArr, nonce, contractLen, contractMap, accArr, client, auth)
txArr = append(txArr, erc20TxArr...) txArr = append(txArr, erc20TxArr...)
......
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