diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-02-15 00:59:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 00:59:00 +0800 |
| commit | a973d1d5233bbd36cbaed0b7235311d4cd529580 (patch) | |
| tree | 61ed1bd31a9c2a2e6a052a122a737deaee70c6cb /light | |
| parent | 15a609d5d6613e37e819975ceba01cb5ba735242 (diff) | |
| parent | c12f4df910e2da1cc5dd28c5c4bbe2d8721e1057 (diff) | |
| download | go-tangerine-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar go-tangerine-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.gz go-tangerine-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.bz2 go-tangerine-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.lz go-tangerine-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.xz go-tangerine-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.zst go-tangerine-a973d1d5233bbd36cbaed0b7235311d4cd529580.zip | |
Merge pull request #3674 from obscuren/gaz64
params: core, core/vm, miner: 64bit gas instructions
Diffstat (limited to 'light')
| -rw-r--r-- | light/odr_test.go | 8 | ||||
| -rw-r--r-- | light/txpool_test.go | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/light/odr_test.go b/light/odr_test.go index a2f969acb..a76050a29 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -49,6 +49,8 @@ var ( testContractCode = common.Hex2Bytes("606060405260cc8060106000396000f360606040526000357c01000000000000000000000000000000000000000000000000000000009004806360cd2685146041578063c16431b914606b57603f565b005b6055600480803590602001909190505060a9565b6040518082815260200191505060405180910390f35b60886004808035906020019091908035906020019091905050608a565b005b80600060005083606481101560025790900160005b50819055505b5050565b6000600060005082606481101560025790900160005b5054905060c7565b91905056") testContractAddr common.Address + + bigTxGas = new(big.Int).SetUint64(params.TxGas) ) type testOdr struct { @@ -205,15 +207,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), params.TxGas, nil, nil), signer, testBankKey) + tx, _ := types.SignTx(types.NewTransaction(block.TxNonce(testBankAddress), acc1Addr, big.NewInt(10000), bigTxGas, 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), params.TxGas, nil, nil), signer, testBankKey) + tx1, _ := types.SignTx(types.NewTransaction(block.TxNonce(testBankAddress), acc1Addr, big.NewInt(1000), bigTxGas, nil, nil), signer, testBankKey) nonce := block.TxNonce(acc1Addr) - tx2, _ := types.SignTx(types.NewTransaction(nonce, acc2Addr, big.NewInt(1000), params.TxGas, nil, nil), signer, acc1Key) + tx2, _ := types.SignTx(types.NewTransaction(nonce, acc2Addr, big.NewInt(1000), bigTxGas, nil, nil), signer, acc1Key) nonce++ tx3, _ := types.SignTx(types.NewContractCreation(nonce, big.NewInt(0), big.NewInt(1000000), big.NewInt(0), testContractCode), signer, acc1Key) testContractAddr = crypto.CreateAddress(acc1Addr, nonce) diff --git a/light/txpool_test.go b/light/txpool_test.go index d8f04e617..af2dcbbef 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -77,7 +77,7 @@ func txPoolTestChainGen(i int, block *core.BlockGen) { func TestTxPool(t *testing.T) { for i := range testTx { - testTx[i], _ = types.SignTx(types.NewTransaction(uint64(i), acc1Addr, big.NewInt(10000), params.TxGas, nil, nil), types.HomesteadSigner{}, testBankKey) + testTx[i], _ = types.SignTx(types.NewTransaction(uint64(i), acc1Addr, big.NewInt(10000), bigTxGas, nil, nil), types.HomesteadSigner{}, testBankKey) } var ( |