interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #867 from Gustav-Simonsson/fix_block_tests_genesis_block_total_difficulty 

Fix block tests genesis block total difficulty
This commit is contained in:
Jeffrey Wilcke 2015-05-06 14:52:55 -07:00
parent a0cb1945ae 7bc1f487b8
commit 82ac4712f1
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/geth/blocktest.go
View File

@ -113,7 +113,6 @@ func runOneBlockTest(ctx *cli.Context, test *tests.BlockTest) (*eth.Ethereum, er
return ethereum, fmt.Errorf("Block Test load error: %v", err) return ethereum, fmt.Errorf("Block Test load error: %v", err)
} }
fmt.Println("chain loaded")
if err := test.ValidatePostState(statedb); err != nil { if err := test.ValidatePostState(statedb); err != nil {
return ethereum, fmt.Errorf("post state validation failed: %v", err) return ethereum, fmt.Errorf("post state validation failed: %v", err)
} }

1
core/chain_manager.go
View File

@ -320,6 +320,7 @@ func (bc *ChainManager) ResetWithGenesisBlock(gb *types.Block) {
} }
// Prepare the genesis block // Prepare the genesis block
gb.Td = gb.Difficulty()
bc.genesisBlock = gb bc.genesisBlock = gb
bc.write(bc.genesisBlock) bc.write(bc.genesisBlock)
bc.insert(bc.genesisBlock) bc.insert(bc.genesisBlock)

3
tests/block_test.go
View File

@ -17,12 +17,10 @@ func TestBcValidBlockTests(t *testing.T) {
} }
func TestBcUncleTests(t *testing.T) { func TestBcUncleTests(t *testing.T) {
t.Skip("Skipped until https://github.com/ethereum/go-ethereum/pull/857 is merged.")
runBlockTestsInFile("files/BlockTests/bcUncleTest.json", []string{}, t) runBlockTestsInFile("files/BlockTests/bcUncleTest.json", []string{}, t)
} }
func TestBcUncleHeaderValidityTests(t *testing.T) { func TestBcUncleHeaderValidityTests(t *testing.T) {
t.Skip("Skipped until https://github.com/ethereum/go-ethereum/pull/857 is merged.")
runBlockTestsInFile("files/BlockTests/bcUncleHeaderValiditiy.json", []string{}, t) runBlockTestsInFile("files/BlockTests/bcUncleHeaderValiditiy.json", []string{}, t)
} }
@ -39,7 +37,6 @@ func TestBcJSAPITests(t *testing.T) {
} }
func TestBcRPCAPITests(t *testing.T) { func TestBcRPCAPITests(t *testing.T) {
t.Skip("Skipped until https://github.com/ethereum/go-ethereum/pull/857 is merged.")
runBlockTestsInFile("files/BlockTests/bcRPC_API_Test.json", []string{}, t) runBlockTestsInFile("files/BlockTests/bcRPC_API_Test.json", []string{}, t)
} }