fix bug

[bytom/vapor.git] / consensus / consensus / dpos / dpos.go

diff --git a/consensus/consensus/dpos/dpos.go b/consensus/consensus/dpos/dpos.go
index 69abaf0..04dfd14 100644 (file)
--- a/consensus/consensus/dpos/dpos.go
+++ b/consensus/consensus/dpos/dpos.go
@@ -97,9 +97,6 @@ var GDpos = &DposType{
 func (d *DposType) Init(c chain.Chain, delegateNumber, intervalTime, blockHeight uint64, blockHash bc.Hash) error {
        d.c = c
        vote, err := newVote(blockHeight, blockHash)
-       if err != nil {
-               return err
-       }
        d.vote = vote
        d.MaxDelegateNumber = delegateNumber
        d.BlockIntervalTime = intervalTime
@@ -112,7 +109,7 @@ func (d *DposType) Init(c chain.Chain, delegateNumber, intervalTime, blockHeight
        GDpos.ReadIrreversibleBlockInfo(&GDpos.irreversibleBlockInfo)
        header, _ := c.GetHeaderByHeight(d.DposStartHeight)
        d.setStartTime(header.Timestamp)
-       return nil
+       return err
 }
 
 func (d *DposType) setStartTime(t uint64) {
@@ -191,7 +188,7 @@ func (d *DposType) GetNextDelegates(t uint64) interface{} {
        }
        delegates = append(delegates, delegate)
        delegateInfo := DelegateInfo{}
-       delegateInfo.Delegates = SortDelegate(delegates, t)
+       delegateInfo.Delegates = delegates //SortDelegate(delegates, t)
        return &delegateInfo
 }
 
@@ -373,6 +370,7 @@ func (d *DposType) CheckBlockDelegate(block types.Block) error {
        if len(delegateInfo.Delegates) != len(nextDelegateInfo.Delegates) {
                return errors.New("The delegates num is not correct in block")
        }
+
        for index, v := range delegateInfo.Delegates {
                if v.DelegateAddress != nextDelegateInfo.Delegates[index].DelegateAddress {
                        return errors.New("The delegates address is not correct in block")