Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
Showing only changes of commit 6a575eda6f - Show all commits

View File

@ -638,11 +638,14 @@ func newStates(keys []common.Hash, vals []common.Hash) *map[common.Hash]common.H
func TestTraceChain(t *testing.T) { func TestTraceChain(t *testing.T) {
// Initialize test accounts // Initialize test accounts
accounts := newAccounts(3) accounts := newAccounts(3)
genesis := &core.Genesis{Alloc: core.GenesisAlloc{ genesis := &core.Genesis{
accounts[0].addr: {Balance: big.NewInt(params.Ether)}, Config: params.TestChainConfig,
accounts[1].addr: {Balance: big.NewInt(params.Ether)}, Alloc: core.GenesisAlloc{
accounts[2].addr: {Balance: big.NewInt(params.Ether)}, accounts[0].addr: {Balance: big.NewInt(params.Ether)},
}} accounts[1].addr: {Balance: big.NewInt(params.Ether)},
accounts[2].addr: {Balance: big.NewInt(params.Ether)},
},
}
genBlocks := 50 genBlocks := 50
signer := types.HomesteadSigner{} signer := types.HomesteadSigner{}