protocols: fix failing dBFT test

Should be a part of #298.

Signed-off-by: Anna Shaleva <[email protected]>

Author: AnnaShaleva

eth/protocols/dbft/handler_test.go

@@ -29,9 +29,9 @@ func TestHandling(t *testing.T) {
 		key, _         = crypto.GenerateKey()
 		addr           = crypto.PubkeyToAddress(key.PublicKey)
 		bc             = &testBC{height: 10}
-		s1             = New(bc, nil, func(u uint64, address common.Address) bool { return true })
-		s2             = New(bc, nil, func(u uint64, address common.Address) bool { return true })
-		s3             = New(bc, nil, func(u uint64, address common.Address) bool { return true })
+		s1             = New(bc, nil, func(u uint64, address common.Address) error { return nil })
+		s2             = New(bc, nil, func(u uint64, address common.Address) error { return nil })
+		s3             = New(bc, nil, func(u uint64, address common.Address) error { return nil })
 		p1             = p2p.NewPeer(enode.ID{1}, "peer1", nil)
 		p2             = p2p.NewPeer(enode.ID{2}, "peer2", nil)
 		p3             = p2p.NewPeer(enode.ID{3}, "peer3", nil)

eth/protocols/dbft/pool.go

@@ -6,6 +6,7 @@ package dbft
 import (
 	"container/list"
 	"errors"
+	"fmt"
 	"sync"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -96,7 +97,7 @@ func (p *Pool) verify(m *Message) (bool, error) {
 		if errors.Is(err, ErrSyncing) {
 			return false, nil
 		}
-		return false, err
+		return false, fmt.Errorf("%w: %w", errDisallowedSender, err)
 	}
 	return true, nil
 }

eth/protocols/dbft/pool_test.go

@@ -22,6 +22,12 @@ func TestAddGet(t *testing.T) {
 		m := someMessage(t, 100, bc.goodAddrs[0], bc.badKey)
 		p.testAdd(t, false, invalidSig, m)
 	})
+	t.Run("syncing", func(t *testing.T) {
+		bc.syncing = true
+		m := bc.badMessage(t, 100)
+		p.testAdd(t, false, nil, m)
+		bc.syncing = false
+	})
 	t.Run("disallowed sender", func(t *testing.T) {
 		m := bc.badMessage(t, 100)
 		p.testAdd(t, false, errDisallowedSender, m)
@@ -106,6 +112,7 @@ type testChain struct {
 	badKey    *ecdsa.PrivateKey
 	goodAddrs []common.Address
 	badAddr   common.Address
+	syncing   bool
 }
 
 var errVerification = errors.New("verification failed")
@@ -120,13 +127,16 @@ func newTestChain() *testChain {
 		badAddr:   crypto.PubkeyToAddress(bk.PublicKey),
 	}
 }
-func (c *testChain) IsAddressAllowed(u common.Address) bool {
+func (c *testChain) IsAddressAllowed(u common.Address) error {
+	if c.syncing {
+		return ErrSyncing
+	}
 	for i := range c.goodAddrs {
 		if u == c.goodAddrs[i] {
-			return true
+			return nil
 		}
 	}
-	return false
+	return errors.New("address not allowed")
 }
 func (c *testChain) BlockHeight() uint64 { return c.height }