diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-02-13 23:13:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 23:13:40 +0800 |
| commit | 0850f68fd17586370b102aa516739476db4913c2 (patch) | |
| tree | 5d2f140139f3763a7da3c20a88acff96b58ec8ad /les/helper_test.go | |
| parent | f8f428cc18c5f70814d7b3937128781bac14bffd (diff) | |
| parent | 57f4e9025757254536a738bb4771712038f1e763 (diff) | |
| download | dexon-0850f68fd17586370b102aa516739476db4913c2.tar dexon-0850f68fd17586370b102aa516739476db4913c2.tar.gz dexon-0850f68fd17586370b102aa516739476db4913c2.tar.bz2 dexon-0850f68fd17586370b102aa516739476db4913c2.tar.lz dexon-0850f68fd17586370b102aa516739476db4913c2.tar.xz dexon-0850f68fd17586370b102aa516739476db4913c2.tar.zst dexon-0850f68fd17586370b102aa516739476db4913c2.zip | |
Merge pull request #3668 from obscuren/revert-gas64
Revert "params: core, core/vm, miner: 64bit gas instructions (#3514)"
Diffstat (limited to 'les/helper_test.go')
| -rw-r--r-- | les/helper_test.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/les/helper_test.go b/les/helper_test.go index 2c6f34a92..e0b7558ee 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -57,8 +57,6 @@ var ( testContractDeployed = uint64(2) testBufLimit = uint64(100) - - bigTxGas = new(big.Int).SetUint64(params.TxGas) ) /* @@ -82,15 +80,15 @@ func testChainGen(i int, block *core.BlockGen) { switch i { case 0: // In block 1, the test bank sends account #1 some ether. - tx, _ := types.SignTx(types.NewTransaction(block.TxNonce(testBankAddress), acc1Addr, big.NewInt(10000), bigTxGas, nil, nil), signer, testBankKey) + tx, _ := types.SignTx(types.NewTransaction(block.TxNonce(testBankAddress), acc1Addr, big.NewInt(10000), params.TxGas, nil, nil), signer, testBankKey) block.AddTx(tx) case 1: // In block 2, the test bank sends some more ether to account #1. // acc1Addr passes it on to account #2. // acc1Addr creates a test contract. - tx1, _ := types.SignTx(types.NewTransaction(block.TxNonce(testBankAddress), acc1Addr, big.NewInt(1000), bigTxGas, nil, nil), signer, testBankKey) + tx1, _ := types.SignTx(types.NewTransaction(block.TxNonce(testBankAddress), acc1Addr, big.NewInt(1000), params.TxGas, nil, nil), signer, testBankKey) nonce := block.TxNonce(acc1Addr) - tx2, _ := types.SignTx(types.NewTransaction(nonce, acc2Addr, big.NewInt(1000), bigTxGas, nil, nil), signer, acc1Key) + tx2, _ := types.SignTx(types.NewTransaction(nonce, acc2Addr, big.NewInt(1000), params.TxGas, nil, nil), signer, acc1Key) nonce++ tx3, _ := types.SignTx(types.NewContractCreation(nonce, big.NewInt(0), big.NewInt(200000), big.NewInt(0), testContractCode), signer, acc1Key) testContractAddr = crypto.CreateAddress(acc1Addr, nonce) |