diff options
| author | Felix Lange <fjl@twurst.com> | 2017-03-02 21:03:33 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2017-03-23 22:58:43 +0800 |
| commit | 37dd9086ec491900311fc39837f4a62ef5fd3a4a (patch) | |
| tree | 0d2c7bb99ad1cd2ffa6d014e44288452a537aba5 /contracts | |
| parent | 67c47459f283842bbf0063d9a1dc078251d6f433 (diff) | |
| download | dexon-37dd9086ec491900311fc39837f4a62ef5fd3a4a.tar.gz dexon-37dd9086ec491900311fc39837f4a62ef5fd3a4a.tar.zst dexon-37dd9086ec491900311fc39837f4a62ef5fd3a4a.zip | |
core: refactor genesis handling
This commit solves several issues concerning the genesis block:
* Genesis/ChainConfig loading was handled by cmd/geth code. This left
library users in the cold. They could specify a JSON-encoded
string and overwrite the config, but didn't get any of the additional
checks performed by geth.
* Decoding and writing of genesis JSON was conflated in
WriteGenesisBlock. This made it a lot harder to embed the genesis
block into the forthcoming config file loader. This commit changes
things so there is a single Genesis type that represents genesis
blocks. All uses of Write*Genesis* are changed to use the new type
instead.
* If the chain config supplied by the user was incompatible with the
current chain (i.e. the chain had already advanced beyond a scheduled
fork), it got overwritten. This is not an issue in practice because
previous forks have always had the highest total difficulty. It might
matter in the future though. The new code reverts the local chain to
the point of the fork when upgrading configuration.
The change to genesis block data removes compression library
dependencies from package core.
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}) |