From 885babf92d628d2877fc5966a97262e8378a016f Mon Sep 17 00:00:00 2001 From: Nguyen Sy Thanh Son Date: Thu, 3 Jan 2019 15:11:59 +0000 Subject: [PATCH] not remove after read --- consensus/posv/posv.go | 10 +++++----- contracts/utils.go | 3 --- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/consensus/posv/posv.go b/consensus/posv/posv.go index cd62a5843d..4939b0708e 100644 --- a/consensus/posv/posv.go +++ b/consensus/posv/posv.go @@ -888,12 +888,12 @@ func (c *Posv) Finalize(chain consensus.ChainReader, header *types.Header, state } } - if !c.EnableCache && c.BlockSigners.Len() >= 2700 { - fmt.Println("EnableCache true c.BlockSigners.Len()", c.BlockSigners.Len()) - c.EnableCache = true - } - if c.HookReward != nil && number%rCheckpoint == 0 { + if !c.EnableCache && c.BlockSigners.Len() >= 2700 { + fmt.Println("EnableCache true c.BlockSigners.Len()", c.BlockSigners.Len()) + c.EnableCache = true + } + err, rewards := c.HookReward(chain, state, header) if err != nil { return nil, err diff --git a/contracts/utils.go b/contracts/utils.go index 17059a6c8f..fb63499e78 100644 --- a/contracts/utils.go +++ b/contracts/utils.go @@ -210,7 +210,6 @@ func GetSignersFromContract(c *posv.Posv, addrBlockSigner common.Address, client } return addrs, nil } else { - c.BlockSigners.Remove(blockHash) return caddrs.([]common.Address), nil } return nil, nil @@ -357,10 +356,8 @@ func GetRewardForCheckpoint(c *posv.Posv, chain consensus.ChainReader, blockSign go func(i uint64) { block := chain.GetHeaderByNumber(i) addrs, err := GetSignersFromContract(c, blockSignerAddr, client, block.Hash()) - // addrs, err := GetSignersFromContract2(c, blockSignerAddr, client, block.Hash()) if err != nil { log.Crit("Fail to get signers from smartcontract.", "error", err, "blockNumber", i) - // return nil, err } squeue <- addrs }(i)