diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-03-23 23:36:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 23:36:38 +0800 |
| commit | 8771c3061f340451d0966adcc547338a25f2231f (patch) | |
| tree | c566cab81cf95a39f85fbe2c98a932af9495eb68 /contracts | |
| parent | 11e7a712f469fb24ddb88ecebcefab6ed8880eb8 (diff) | |
| parent | 37dd9086ec491900311fc39837f4a62ef5fd3a4a (diff) | |
| download | dexon-8771c3061f340451d0966adcc547338a25f2231f.tar dexon-8771c3061f340451d0966adcc547338a25f2231f.tar.gz dexon-8771c3061f340451d0966adcc547338a25f2231f.tar.bz2 dexon-8771c3061f340451d0966adcc547338a25f2231f.tar.lz dexon-8771c3061f340451d0966adcc547338a25f2231f.tar.xz dexon-8771c3061f340451d0966adcc547338a25f2231f.tar.zst dexon-8771c3061f340451d0966adcc547338a25f2231f.zip | |
Merge pull request #3794 from fjl/core-genesis-refactor
core: refactor genesis handling
Diffstat (limited to 'contracts')
| -rw-r--r-- | contracts/chequebook/cheque_test.go | 10 | ||||
| -rw-r--r-- | contracts/ens/ens_test.go | 2 | ||||
| -rw-r--r-- | contracts/release/contract_test.go | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/contracts/chequebook/cheque_test.go b/contracts/chequebook/cheque_test.go index 4029fd549..d5b343024 100644 --- a/contracts/chequebook/cheque_test.go +++ b/contracts/chequebook/cheque_test.go @@ -42,11 +42,11 @@ var ( ) func newTestBackend() *backends.SimulatedBackend { - return backends.NewSimulatedBackend( - core.GenesisAccount{Address: addr0, Balance: big.NewInt(1000000000)}, - core.GenesisAccount{Address: addr1, Balance: big.NewInt(1000000000)}, - core.GenesisAccount{Address: addr2, Balance: big.NewInt(1000000000)}, - ) + return backends.NewSimulatedBackend(core.GenesisAlloc{ + addr0: {Balance: big.NewInt(1000000000)}, + addr1: {Balance: big.NewInt(1000000000)}, + addr2: {Balance: big.NewInt(1000000000)}, + }) } func deploy(prvKey *ecdsa.PrivateKey, amount *big.Int, backend *backends.SimulatedBackend) (common.Address, error) { diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 373ce2e30..5faa9b1ad 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -34,7 +34,7 @@ var ( ) func TestENS(t *testing.T) { - contractBackend := backends.NewSimulatedBackend(core.GenesisAccount{Address: addr, Balance: big.NewInt(1000000000)}) + 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) diff --git a/contracts/release/contract_test.go b/contracts/release/contract_test.go index 11a039992..348e9aabe 100644 --- a/contracts/release/contract_test.go +++ b/contracts/release/contract_test.go @@ -35,11 +35,11 @@ func setupReleaseTest(t *testing.T, prefund ...*ecdsa.PrivateKey) (*ecdsa.Privat key, _ := crypto.GenerateKey() auth := bind.NewKeyedTransactor(key) - accounts := []core.GenesisAccount{{Address: auth.From, Balance: big.NewInt(10000000000)}} + alloc := core.GenesisAlloc{auth.From: {Balance: big.NewInt(10000000000)}} for _, key := range prefund { - accounts = append(accounts, core.GenesisAccount{Address: crypto.PubkeyToAddress(key.PublicKey), Balance: big.NewInt(10000000000)}) + alloc[crypto.PubkeyToAddress(key.PublicKey)] = core.GenesisAccount{Balance: big.NewInt(10000000000)} } - sim := backends.NewSimulatedBackend(accounts...) + sim := backends.NewSimulatedBackend(alloc) // Deploy a version oracle contract, commit and return _, _, oracle, err := DeployReleaseOracle(auth, sim, []common.Address{auth.From}) |