diff options
Diffstat (limited to 'core/block_validator_test.go')
| -rw-r--r-- | core/block_validator_test.go | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/core/block_validator_test.go b/core/block_validator_test.go index c13aa83db..a07dd9e51 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -17,51 +17,36 @@ package core import ( - "fmt" "math/big" "testing" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/pow" ) -func testChainConfig() *params.ChainConfig { - return params.TestChainConfig - //return ¶ms.ChainConfig{HomesteadBlock: big.NewInt(0)} -} - -func proc() (Validator, *BlockChain) { - db, _ := ethdb.NewMemDatabase() - var mux event.TypeMux - - WriteTestNetGenesisBlock(db) - blockchain, err := NewBlockChain(db, testChainConfig(), pow.NewTestEthash(), &mux, vm.Config{}) - if err != nil { - fmt.Println(err) +func testGenesis(account common.Address, balance *big.Int) *Genesis { + return &Genesis{ + Config: params.TestChainConfig, + Alloc: GenesisAlloc{account: {Balance: balance}}, } - return blockchain.validator, blockchain } func TestNumber(t *testing.T) { - _, chain := proc() - + chain := newTestBlockChain() statedb, _ := state.New(chain.Genesis().Root(), chain.chainDb) - cfg := testChainConfig() - header := makeHeader(cfg, chain.Genesis(), statedb) + header := makeHeader(chain.config, chain.Genesis(), statedb) header.Number = big.NewInt(3) - err := ValidateHeader(cfg, pow.FakePow{}, header, chain.Genesis().Header(), false, false) + err := ValidateHeader(chain.config, pow.FakePow{}, header, chain.Genesis().Header(), false, false) if err != BlockNumberErr { t.Errorf("expected block number error, got %q", err) } - header = makeHeader(cfg, chain.Genesis(), statedb) - err = ValidateHeader(cfg, pow.FakePow{}, header, chain.Genesis().Header(), false, false) + header = makeHeader(chain.config, chain.Genesis(), statedb) + err = ValidateHeader(chain.config, pow.FakePow{}, header, chain.Genesis().Header(), false, false) if err == BlockNumberErr { t.Errorf("didn't expect block number error") } |