gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge ethereum/poc-9 into accounts-integration

Browse Source 
Conflicts:
	cmd/utils/cmd.go
	cmd/utils/flags.go
	core/manager.go
	eth/backend.go
	rpc/http/server.go
	xeth/xeth.go
This commit is contained in:
Felix Lange
2015-03-09 23:25:46 +01:00
parent cd51860bf0 676a0de58d
commit 9bf513e993
84 changed files with 25638 additions and 6387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/blocktest/main.go
View File

@ -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) {