testing (dot/core): rewrite message.go unit tests

dot/core/messages.go

@@ -5,6 +5,7 @@ package core
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/ChainSafe/gossamer/dot/network"
 	"github.com/ChainSafe/gossamer/dot/peerset"
@@ -16,13 +17,13 @@ import (
 )
 
 func (s *Service) validateTransaction(peerID peer.ID, head *types.Header, rt runtime.Instance,
-	tx types.Extrinsic, toPropagate *[]types.Extrinsic) (bool, error) {
+	tx types.Extrinsic) (validity *transaction.Validity, failed bool, err error) {
 	s.storageState.Lock()
 	defer s.storageState.Unlock()
 
 	ts, err := s.storageState.TrieState(&head.StateRoot)
 	if err != nil {
-		return true, err
+		return nil, false, fmt.Errorf("cannot get trie state from storage for root %s: %w", head.StateRoot, err)
 	}
 
 	rt.SetContextStorage(ts)
@@ -39,22 +40,16 @@ func (s *Service) validateTransaction(peerID peer.ID, head *types.Header, rt run
 		}
 
 		logger.Debugf("failed to validate transaction: %s", err)
-		return true, nil
+		return nil, false, nil
 	}
 
-	// create new valid transaction
 	vtx := transaction.NewValidTransaction(tx, val)
 
 	// push to the transaction queue of BABE session
 	hash := s.transactionState.AddToPool(vtx)
 	logger.Tracef("added transaction with hash %s to pool", hash)
 
-	// find tx(s) that should propagate
-	if val.Propagate {
-		*toPropagate = append(*toPropagate, tx)
-	}
-
-	return false, nil
+	return val, true, nil
 }
 
 // HandleTransactionMessage validates each transaction in the message and
@@ -83,19 +78,24 @@ func (s *Service) HandleTransactionMessage(peerID peer.ID, msg *network.Transact
 		return false, err
 	}
 
-	hasInvalidTxn := false
+	isValid := true
 	for _, tx := range txs {
-		isInvalid, err := s.validateTransaction(peerID, head, rt, tx, &toPropagate)
-		if isInvalid {
-			hasInvalidTxn = true
+		validity, isValidTxn, err := s.validateTransaction(peerID, head, rt, tx)
+		if !isValidTxn {
+			isValid = false
+		} else {
+			// find tx(s) that should propagate
+			if validity.Propagate {
+				toPropagate = append(toPropagate, tx)
+			}
 		}
 
 		if err != nil {
 			return false, err
 		}
 	}
 
-	if !hasInvalidTxn {
+	if isValid {
 		s.net.ReportPeer(peerset.ReputationChange{
 			Value:  peerset.GoodTransactionValue,
 			Reason: peerset.GoodTransactionReason,

dot/core/messages_test.go

@@ -212,8 +212,8 @@ func TestServiceHandleTransactionMessage(t *testing.T) {
 					Extrinsics: []types.Extrinsic{{1, 2, 3}, {7, 8, 9, 0}, {0xa, 0xb}},
 				},
 			},
-			expErr:    errDummyErr,
-			expErrMsg: errDummyErr.Error(),
+			expErr: errDummyErr,
+			expErrMsg: "cannot get trie state from storage for root 0x0000000000000000000000000000000000000000000000000000000000000000: dummy error for testing",
 		},
 		{
 			name: "runtime.ErrInvalidTransaction",