From 176b51f1f82039b8340fbbfc39febfefa2860739 Mon Sep 17 00:00:00 2001 From: parmarrushabh Date: Mon, 12 Nov 2018 15:41:24 +0530 Subject: [PATCH] ignore faster with block no validator m2 --- common/types_test.go | 2 +- consensus/errors.go | 4 +++- eth/fetcher/fetcher.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/types_test.go b/common/types_test.go index fd90e47582..b44f66fe09 100644 --- a/common/types_test.go +++ b/common/types_test.go @@ -151,7 +151,7 @@ func BenchmarkAddressHex(b *testing.B) { } func TestRemoveItemInArray(t *testing.T) { - array := []Address{HexToAddress("0x0000003"),HexToAddress("0x0000001"), HexToAddress("0x0000002"),HexToAddress("0x0000003")} + array := []Address{HexToAddress("0x0000003"), HexToAddress("0x0000001"), HexToAddress("0x0000002"), HexToAddress("0x0000003")} remove := []Address{HexToAddress("0x0000002"), HexToAddress("0x0000004"), HexToAddress("0x0000003")} array = RemoveItemFromArray(array, remove) if len(array) != 1 { diff --git a/consensus/errors.go b/consensus/errors.go index c4ff2de539..cb3d7eecb0 100644 --- a/consensus/errors.go +++ b/consensus/errors.go @@ -35,5 +35,7 @@ var ( // plus one. ErrInvalidNumber = errors.New("invalid block number") - ErrMissingValidatorSignature = errors.New("missing validator in header") + ErrFailValidatorSignature = errors.New("missing validator in header") + + ErrNoValidatorSignature = errors.New("no validator in header") ) diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go index 5756ae3592..318e3b5848 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -669,7 +669,7 @@ func (f *Fetcher) insert(peer string, block *types.Block) { time.Sleep(delay) log.Info("Receive future block", "number", block.NumberU64(), "hash", block.Hash().Hex(), "delay", delay) goto again - case consensus.ErrMissingValidatorSignature: + case consensus.ErrNoValidatorSignature: newBlock := block if f.appendM2HeaderHook != nil { if newBlock, err = f.appendM2HeaderHook(block); err != nil {