diff options
| author | gary rong <garyrong0905@gmail.com> | 2017-12-22 20:37:50 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2017-12-22 20:37:50 +0800 |
| commit | 5f8888e11606296c9582496974c0f6b96a882146 (patch) | |
| tree | ef8139ff20ae33eb5a236290d5107dd808e34340 /accounts | |
| parent | 9dbb8ef4aadb8e40aef8b681cf86acd20789abdc (diff) | |
| download | go-tangerine-5f8888e11606296c9582496974c0f6b96a882146.tar go-tangerine-5f8888e11606296c9582496974c0f6b96a882146.tar.gz go-tangerine-5f8888e11606296c9582496974c0f6b96a882146.tar.bz2 go-tangerine-5f8888e11606296c9582496974c0f6b96a882146.tar.lz go-tangerine-5f8888e11606296c9582496974c0f6b96a882146.tar.xz go-tangerine-5f8888e11606296c9582496974c0f6b96a882146.tar.zst go-tangerine-5f8888e11606296c9582496974c0f6b96a882146.zip | |
accounts, consensus, core, eth: make chain maker consensus agnostic (#15497)
* accounts, consensus, core, eth: make chain maker consensus agnostic
* consensus, core: move CalcDifficulty to Engine interface
* consensus: add docs for calcDifficulty function
* consensus, core: minor comment fixups
Diffstat (limited to 'accounts')
| -rw-r--r-- | accounts/abi/bind/backends/simulated.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 09288d401..2cf6b9f78 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -89,7 +89,7 @@ func (b *SimulatedBackend) Rollback() { } func (b *SimulatedBackend) rollback() { - blocks, _ := core.GenerateChain(b.config, b.blockchain.CurrentBlock(), b.database, 1, func(int, *core.BlockGen) {}) + blocks, _ := core.GenerateChain(b.config, b.blockchain.CurrentBlock(), ethash.NewFaker(), b.database, 1, func(int, *core.BlockGen) {}) b.pendingBlock = blocks[0] b.pendingState, _ = state.New(b.pendingBlock.Root(), state.NewDatabase(b.database)) } @@ -291,7 +291,7 @@ func (b *SimulatedBackend) SendTransaction(ctx context.Context, tx *types.Transa panic(fmt.Errorf("invalid transaction nonce: got %d, want %d", tx.Nonce(), nonce)) } - blocks, _ := core.GenerateChain(b.config, b.blockchain.CurrentBlock(), b.database, 1, func(number int, block *core.BlockGen) { + blocks, _ := core.GenerateChain(b.config, b.blockchain.CurrentBlock(), ethash.NewFaker(), b.database, 1, func(number int, block *core.BlockGen) { for _, tx := range b.pendingBlock.Transactions() { block.AddTx(tx) } @@ -306,7 +306,7 @@ func (b *SimulatedBackend) SendTransaction(ctx context.Context, tx *types.Transa func (b *SimulatedBackend) AdjustTime(adjustment time.Duration) error { b.mu.Lock() defer b.mu.Unlock() - blocks, _ := core.GenerateChain(b.config, b.blockchain.CurrentBlock(), b.database, 1, func(number int, block *core.BlockGen) { + blocks, _ := core.GenerateChain(b.config, b.blockchain.CurrentBlock(), ethash.NewFaker(), b.database, 1, func(number int, block *core.BlockGen) { for _, tx := range b.pendingBlock.Transactions() { block.AddTx(tx) } |