diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2018-10-26 09:57:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-26 09:57:08 +0800 |
| commit | 1aa61d3287f63222a6cac8a49be0080a37cad8d6 (patch) | |
| tree | 2f6141aa97615178978aac9e2b9db1d894171137 /core/lattice.go | |
| parent | 1e84ff2da76534b7b2412d2f4e862090dc31192c (diff) | |
| download | dexon-consensus-1aa61d3287f63222a6cac8a49be0080a37cad8d6.tar dexon-consensus-1aa61d3287f63222a6cac8a49be0080a37cad8d6.tar.gz dexon-consensus-1aa61d3287f63222a6cac8a49be0080a37cad8d6.tar.bz2 dexon-consensus-1aa61d3287f63222a6cac8a49be0080a37cad8d6.tar.lz dexon-consensus-1aa61d3287f63222a6cac8a49be0080a37cad8d6.tar.xz dexon-consensus-1aa61d3287f63222a6cac8a49be0080a37cad8d6.tar.zst dexon-consensus-1aa61d3287f63222a6cac8a49be0080a37cad8d6.zip | |
core: Lock entire lattice.ProcessBlock (#259)
* Lock entire ProcessBlock
* Lock Consensus.processBlock
Diffstat (limited to 'core/lattice.go')
| -rw-r--r-- | core/lattice.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/lattice.go b/core/lattice.go index 69ad51c..06005c1 100644 --- a/core/lattice.go +++ b/core/lattice.go @@ -161,8 +161,6 @@ func (s *Lattice) SanityCheck(b *types.Block) (err error) { // NOTE: assume the block passed sanity check. func (s *Lattice) addBlockToLattice( input *types.Block) (outputBlocks []*types.Block, err error) { - s.lock.Lock() - defer s.lock.Unlock() if tip := s.data.chains[input.Position.ChainID].tip; tip != nil { if !input.Position.Newer(&tip.Position) { return @@ -226,6 +224,9 @@ func (s *Lattice) ProcessBlock( deliveredMode uint32 ) + s.lock.Lock() + defer s.lock.Unlock() + if inLattice, err = s.addBlockToLattice(input); err != nil { return } |