From 6f69cdd109b1dd692b8dfb15e7c53d2051fbc946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Mon, 13 Nov 2017 13:47:27 +0200 Subject: all: switch gas limits from big.Int to uint64 --- contracts/chequebook/cheque.go | 4 ++-- contracts/ens/ens.go | 5 ++--- contracts/ens/ens_test.go | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'contracts') diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 09daa9248..f6335adc6 100644 --- a/contracts/chequebook/cheque.go +++ b/contracts/chequebook/cheque.go @@ -56,8 +56,8 @@ import ( // * watching incoming ether var ( - gasToCash = big.NewInt(2000000) // gas cost of a cash transaction using chequebook - // gasToDeploy = big.NewInt(3000000) + gasToCash = uint64(2000000) // gas cost of a cash transaction using chequebook + // gasToDeploy = uint64(3000000) ) // Backend wraps all methods required for chequebook operation. diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go index c292a1714..60c3c83ab 100644 --- a/contracts/ens/ens.go +++ b/contracts/ens/ens.go @@ -19,7 +19,6 @@ package ens //go:generate abigen --sol contract/ens.sol --pkg contract --out contract/ens.go import ( - "math/big" "strings" "github.com/ethereum/go-ethereum/accounts/abi/bind" @@ -163,7 +162,7 @@ func (self *ENS) Register(name string) (*types.Transaction, error) { } opts := self.TransactOpts - opts.GasLimit = big.NewInt(200000) + opts.GasLimit = 200000 return registrar.Contract.Register(&opts, label, self.TransactOpts.From) } @@ -178,6 +177,6 @@ func (self *ENS) SetContentHash(name string, hash common.Hash) (*types.Transacti } opts := self.TransactOpts - opts.GasLimit = big.NewInt(200000) + opts.GasLimit = 200000 return resolver.Contract.SetContent(&opts, node, hash) } diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 5faa9b1ad..9ab137581 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -37,7 +37,7 @@ func TestENS(t *testing.T) { contractBackend := backends.NewSimulatedBackend(core.GenesisAlloc{addr: {Balance: big.NewInt(1000000000)}}) transactOpts := bind.NewKeyedTransactor(key) // Workaround for bug estimating gas in the call to Register - transactOpts.GasLimit = big.NewInt(1000000) + transactOpts.GasLimit = 1000000 ens, err := DeployENS(transactOpts, contractBackend) if err != nil { -- cgit v1.2.3