diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2018-09-11 13:28:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 13:28:44 +0800 |
| commit | 582a491aa0bcb784ac7b65ebbfb42139945ea703 (patch) | |
| tree | 8589bad986f512455717728012c3d9edf3b68c4f /core/consensus.go | |
| parent | 2439f49063d8498eadf26d4fa1220c5eac8412a8 (diff) | |
| download | tangerine-consensus-582a491aa0bcb784ac7b65ebbfb42139945ea703.tar tangerine-consensus-582a491aa0bcb784ac7b65ebbfb42139945ea703.tar.gz tangerine-consensus-582a491aa0bcb784ac7b65ebbfb42139945ea703.tar.bz2 tangerine-consensus-582a491aa0bcb784ac7b65ebbfb42139945ea703.tar.lz tangerine-consensus-582a491aa0bcb784ac7b65ebbfb42139945ea703.tar.xz tangerine-consensus-582a491aa0bcb784ac7b65ebbfb42139945ea703.tar.zst tangerine-consensus-582a491aa0bcb784ac7b65ebbfb42139945ea703.zip | |
core: timestamp (#98)
Diffstat (limited to 'core/consensus.go')
| -rw-r--r-- | core/consensus.go | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/core/consensus.go b/core/consensus.go index 6d74bd7..a9ec6a5 100644 --- a/core/consensus.go +++ b/core/consensus.go @@ -467,8 +467,7 @@ func (con *Consensus) ProcessBlock(block *types.Block) (err error) { } con.app.TotalOrderingDeliver(hashes, earlyDelivered) // Perform timestamp generation. - deliveredBlocks, _, err = con.ctModule.processBlocks( - deliveredBlocks) + err = con.ctModule.processBlocks(deliveredBlocks) if err != nil { return } @@ -518,7 +517,7 @@ func (con *Consensus) PrepareBlock(b *types.Block, defer con.lock.RUnlock() con.rbModule.prepareBlock(b) - b.Timestamps[b.ProposerID] = proposeTime + b.Timestamp = proposeTime b.Payloads = con.app.PreparePayloads(b.Position) b.Hash, err = hashBlock(b) if err != nil { @@ -544,11 +543,7 @@ func (con *Consensus) PrepareGenesisBlock(b *types.Block, b.Position.Height = 0 b.ParentHash = common.Hash{} b.Acks = make(map[common.Hash]struct{}) - b.Timestamps = make(map[types.ValidatorID]time.Time) - for vID := range con.gov.GetValidatorSet() { - b.Timestamps[vID] = time.Time{} - } - b.Timestamps[b.ProposerID] = proposeTime + b.Timestamp = proposeTime b.Hash, err = hashBlock(b) if err != nil { return |