remove useless code

This commit is contained in:
Nguyen Ba Tam 2018-11-05 17:11:54 +07:00
parent 60c05f392f
commit 6cee868dc5
2 changed files with 3 additions and 8 deletions

View file

@ -652,7 +652,7 @@ func (c *Posv) verifySeal(chain consensus.ChainReader, header *types.Header, par
} }
// verify validator // verify validator
assignedValidator, err := c.GetValidator(creator, snap, chain, header) assignedValidator, err := c.GetValidator(creator, chain, header)
if err != nil { if err != nil {
return err return err
} }
@ -664,7 +664,7 @@ func (c *Posv) verifySeal(chain consensus.ChainReader, header *types.Header, par
return nil return nil
} }
func (c *Posv) GetValidator(creator common.Address, snap *Snapshot, chain consensus.ChainReader, header *types.Header) (common.Address, error) { func (c *Posv) GetValidator(creator common.Address, chain consensus.ChainReader, header *types.Header) (common.Address, error) {
epoch := c.config.Epoch epoch := c.config.Epoch
no := header.Number.Uint64() no := header.Number.Uint64()
cpNo := no cpNo := no

View file

@ -200,16 +200,11 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
log.Error("Cannot get etherbase for append m2 header", "err", err) log.Error("Cannot get etherbase for append m2 header", "err", err)
return block, fmt.Errorf("etherbase missing: %v", err) return block, fmt.Errorf("etherbase missing: %v", err)
} }
// Get m1.
snap, err := c.GetSnapshot(eth.blockchain, eth.blockchain.CurrentHeader())
if err != nil {
return block, fmt.Errorf("can't get snapshot: %v", err)
}
m1, err := c.RecoverSigner(block.Header()) m1, err := c.RecoverSigner(block.Header())
if err != nil { if err != nil {
return block, fmt.Errorf("can't get block creator: %v", err) return block, fmt.Errorf("can't get block creator: %v", err)
} }
m2, err := c.GetValidator(m1, snap, eth.blockchain, block.Header()) m2, err := c.GetValidator(m1, eth.blockchain, block.Header())
if err != nil { if err != nil {
return block, fmt.Errorf("can't get block validator: %v", err) return block, fmt.Errorf("can't get block validator: %v", err)
} }