Merge pull request #1604 from obscuren/db-merge

core, eth, trie, xeth: merged state, chain, extra databases in one
This commit is contained in:
Jeffrey Wilcke
2015-08-09 05:16:37 -07:00
21 changed files with 224 additions and 188 deletions

View File

@ -204,7 +204,7 @@ func (test *BlockTest) makeEthConfig() *eth.Config {
// InsertPreState populates the given database with the genesis
// accounts defined by the test.
func (t *BlockTest) InsertPreState(ethereum *eth.Ethereum) (*state.StateDB, error) {
db := ethereum.StateDb()
db := ethereum.ChainDb()
statedb := state.New(common.Hash{}, db)
for addrString, acct := range t.preAccounts {
addr, err := hex.DecodeString(addrString)