diff options
author | Maran <maran.hidskes@gmail.com> | 2014-03-17 17:41:05 +0800 |
---|---|---|
committer | Maran <maran.hidskes@gmail.com> | 2014-03-17 17:41:05 +0800 |
commit | 095d5baaed03f1077f39a468c11fb3aae1446a58 (patch) | |
tree | 2a44fdecf8ddaf71c7e686962ec55363bc7b403c /peer.go | |
parent | 8ea7e21f64842380833cce7aafa52b909cb8426b (diff) | |
parent | b15a4985e89b1fbf67731bde2e4cef45b3fdf347 (diff) | |
download | go-tangerine-095d5baaed03f1077f39a468c11fb3aae1446a58.tar go-tangerine-095d5baaed03f1077f39a468c11fb3aae1446a58.tar.gz go-tangerine-095d5baaed03f1077f39a468c11fb3aae1446a58.tar.bz2 go-tangerine-095d5baaed03f1077f39a468c11fb3aae1446a58.tar.lz go-tangerine-095d5baaed03f1077f39a468c11fb3aae1446a58.tar.xz go-tangerine-095d5baaed03f1077f39a468c11fb3aae1446a58.tar.zst go-tangerine-095d5baaed03f1077f39a468c11fb3aae1446a58.zip |
Merge conflicts
Diffstat (limited to 'peer.go')
-rw-r--r-- | peer.go | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -293,7 +293,8 @@ func (p *Peer) HandleInbound() { var err error for i := msg.Data.Len() - 1; i >= 0; i-- { block = ethchain.NewBlockFromRlpValue(msg.Data.Get(i)) - // FIXME p.ethereum.BlockManager.DefaultPrepare(block) + + p.ethereum.StateManager().PrepareDefault(block) err = p.ethereum.StateManager().ProcessBlock(block) if err != nil { |