diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-10 06:25:46 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-10 06:25:46 +0800 |
| commit | 9bf513e99305af733110cf23a0b47c8e73359010 (patch) | |
| tree | f9d36e1ae1f2f7c3eb803c7499a4e85a5cdcd5bd /cmd/blocktest | |
| parent | cd51860bf024d949a09b3863c88a278a386227a7 (diff) | |
| parent | 676a0de58d3d7c508b0eeeff192d2095a46f7382 (diff) | |
| download | go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.gz go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.zst go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.zip | |
Merge ethereum/poc-9 into accounts-integration
Conflicts:
cmd/utils/cmd.go
cmd/utils/flags.go
core/manager.go
eth/backend.go
rpc/http/server.go
xeth/xeth.go
Diffstat (limited to 'cmd/blocktest')
| -rw-r--r-- | cmd/blocktest/main.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmd/blocktest/main.go b/cmd/blocktest/main.go index b96f42710..d9d97abc9 100644 --- a/cmd/blocktest/main.go +++ b/cmd/blocktest/main.go @@ -125,11 +125,15 @@ func main() { } func memchain() *core.ChainManager { - db, err := ethdb.NewMemDatabase() + blockdb, err := ethdb.NewMemDatabase() if err != nil { utils.Fatalf("Could not create in-memory database: %v", err) } - return core.NewChainManager(db, new(event.TypeMux)) + statedb, err := ethdb.NewMemDatabase() + if err != nil { + utils.Fatalf("Could not create in-memory database: %v", err) + } + return core.NewChainManager(blockdb, statedb, new(event.TypeMux)) } func loadBlocksFromTestFile(filePath string) (blocks types.Blocks, err error) { |