diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2019-04-01 18:01:26 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-15 22:09:55 +0800 |
| commit | bde4a6cc02c6806093d2a49a86463f81358ca3d8 (patch) | |
| tree | bc3d617f8ff755f6cca5c4fc1dff7b5457845c9f /dex/blockproposer.go | |
| parent | 3c0372165e723de9f1bd3ea8dacd579810463f6d (diff) | |
| download | go-tangerine-bde4a6cc02c6806093d2a49a86463f81358ca3d8.tar.gz go-tangerine-bde4a6cc02c6806093d2a49a86463f81358ca3d8.tar.zst go-tangerine-bde4a6cc02c6806093d2a49a86463f81358ca3d8.zip | |
vendor: sync to latest core (#320)
* vendor: sync to latest core
* dex, core: fix conflict
x
Diffstat (limited to 'dex/blockproposer.go')
| -rw-r--r-- | dex/blockproposer.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dex/blockproposer.go b/dex/blockproposer.go index 846e65617..c035eda7c 100644 --- a/dex/blockproposer.go +++ b/dex/blockproposer.go @@ -172,13 +172,13 @@ Loop: b.watchCat.Feed(blocks[len(blocks)-1].Position) log.Debug("Filling compaction chain", "num", len(blocks), - "first", blocks[0].Finalization.Height, - "last", blocks[len(blocks)-1].Finalization.Height) + "first", blocks[0].Position.Height, + "last", blocks[len(blocks)-1].Position.Height) if _, err := consensusSync.SyncBlocks(blocks, false); err != nil { log.Debug("SyncBlocks fail", "err", err) return nil, err } - coreHeight = blocks[len(blocks)-1].Finalization.Height + coreHeight = blocks[len(blocks)-1].Position.Height select { case <-b.stopCh: @@ -203,8 +203,8 @@ ListenLoop: if len(blocks) > 0 { b.watchCat.Feed(blocks[len(blocks)-1].Position) log.Debug("Filling compaction chain", "num", len(blocks), - "first", blocks[0].Finalization.Height, - "last", blocks[len(blocks)-1].Finalization.Height) + "first", blocks[0].Position.Height, + "last", blocks[len(blocks)-1].Position.Height) synced, err := consensusSync.SyncBlocks(blocks, true) if err != nil { log.Error("SyncBlocks fail", "err", err) @@ -215,7 +215,7 @@ ListenLoop: log.Debug("Consensus core synced") break ListenLoop } - coreHeight = blocks[len(blocks)-1].Finalization.Height + coreHeight = blocks[len(blocks)-1].Position.Height } case <-sub.Err(): log.Debug("System stopped when syncing consensus core") |