From a2436b50ae570eb92afd836ca93005b60f6e0e21 Mon Sep 17 00:00:00 2001 From: Jimmy Hu Date: Mon, 1 Apr 2019 18:01:26 +0800 Subject: vendor: sync to latest core (#320) * vendor: sync to latest core * dex, core: fix conflict x --- core/headerchain.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/headerchain.go b/core/headerchain.go index 0c2000064..b6aa66b60 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -535,15 +535,15 @@ func (hc *HeaderChain) verifyDexonHeader(header *types.Header, } } - if header.Time != uint64(coreBlock.Finalization.Timestamp.UnixNano()/1000000) { + if header.Time != uint64(coreBlock.Timestamp.UnixNano()/1000000) { return fmt.Errorf("timestamp mismatch") } - if header.Number.Uint64() != coreBlock.Finalization.Height { + if header.Number.Uint64() != coreBlock.Position.Height { return fmt.Errorf("height mismatch") } - if !reflect.DeepEqual(header.Randomness, coreBlock.Finalization.Randomness) { + if !reflect.DeepEqual(header.Randomness, coreBlock.Randomness) { return fmt.Errorf("randomness mismatch") } @@ -562,7 +562,7 @@ func (hc *HeaderChain) verifyTSig(coreBlock *coreTypes.Block, verifierCache *dexCore.TSigVerifierCache) error { round := coreBlock.Position.Round - randomness := coreBlock.Finalization.Randomness + randomness := coreBlock.Randomness if round == 0 { return nil -- cgit v1.2.3