testing(dot/core): rewrite dot/core service tests (part 2)

.github/workflows/integration-tests.yml

@@ -23,6 +23,7 @@ jobs:
       matrix:
         packages:
           [
+            github.com/ChainSafe/gossamer/dot/core,
             github.com/ChainSafe/gossamer/dot/rpc/modules,
             github.com/ChainSafe/gossamer/lib/babe,
           ]

dot/core/helpers_test.go

@@ -7,10 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ChainSafe/gossamer/dot/network"
-	"github.com/ChainSafe/gossamer/dot/peerset"
 	"github.com/ChainSafe/gossamer/dot/state"
-	"github.com/ChainSafe/gossamer/dot/types"
 	"github.com/ChainSafe/gossamer/internal/log"
 	"github.com/ChainSafe/gossamer/lib/common"
 	"github.com/ChainSafe/gossamer/lib/crypto/sr25519"
@@ -21,7 +18,6 @@ import (
 	"github.com/ChainSafe/gossamer/lib/runtime/wasmer"
 	"github.com/ChainSafe/gossamer/lib/utils"
 	"github.com/golang/mock/gomock"
-	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/stretchr/testify/require"
 )
 
@@ -35,9 +31,7 @@ func NewTestService(t *testing.T, cfg *Config) *Service {
 	}
 
 	if cfg.DigestHandler == nil {
-		digestHandler := NewMockDigestHandler(ctrl)
-		digestHandler.EXPECT().HandleDigests(gomock.AssignableToTypeOf(new(types.Header)))
-		cfg.DigestHandler = digestHandler
+		cfg.DigestHandler = NewMockDigestHandler(ctrl)
 	}
 
 	if cfg.Keystore == nil {
@@ -126,14 +120,7 @@ func NewTestService(t *testing.T, cfg *Config) *Service {
 	cfg.BlockState.StoreRuntime(cfg.BlockState.BestBlockHash(), cfg.Runtime)
 
 	if cfg.Network == nil {
-		net := NewMockNetwork(ctrl)
-		net.EXPECT().GossipMessage(gomock.AssignableToTypeOf(new(network.TransactionMessage)))
-		net.EXPECT().IsSynced().Return(true)
-		net.EXPECT().ReportPeer(
-			gomock.AssignableToTypeOf(peerset.ReputationChange{}),
-			gomock.AssignableToTypeOf(peer.ID("")),
-		)
-		cfg.Network = net
+		cfg.Network = NewMockNetwork(ctrl)
 	}
 
 	if cfg.CodeSubstitutes == nil {

dot/core/messages_integration_test.go

@@ -13,10 +13,9 @@ import (
 
 	"github.com/centrifuge/go-substrate-rpc-client/v3/signature"
 	ctypes "github.com/centrifuge/go-substrate-rpc-client/v3/types"
-	"github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/require"
 
 	"github.com/ChainSafe/gossamer/dot/network"
+	"github.com/ChainSafe/gossamer/dot/peerset"
 	"github.com/ChainSafe/gossamer/dot/state"
 	"github.com/ChainSafe/gossamer/dot/sync"
 	"github.com/ChainSafe/gossamer/dot/types"
@@ -25,6 +24,10 @@ import (
 	"github.com/ChainSafe/gossamer/lib/keystore"
 	"github.com/ChainSafe/gossamer/lib/runtime"
 	"github.com/ChainSafe/gossamer/pkg/scale"
+
+	"github.com/golang/mock/gomock"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/stretchr/testify/require"
 )
 
 func createExtrinsic(t *testing.T, rt runtime.Instance, genHash common.Hash, nonce uint64) types.Extrinsic {
@@ -77,6 +80,10 @@ func TestService_HandleBlockProduced(t *testing.T) {
 		Keystore: keystore.NewGlobalKeystore(),
 	}
 
+	digestHandler := NewMockDigestHandler(ctrl)
+	digestHandler.EXPECT().HandleDigests(gomock.AssignableToTypeOf(new(types.Header)))
+	cfg.DigestHandler = digestHandler
+
 	s := NewTestService(t, cfg)
 	err := s.Start()
 	require.NoError(t, err)
@@ -132,9 +139,22 @@ func TestService_HandleTransactionMessage(t *testing.T) {
 	telemetryMock := NewMockClient(ctrl)
 	telemetryMock.EXPECT().SendMessage(gomock.Any()).AnyTimes()
 
+	digestHandler := NewMockDigestHandler(ctrl)
+	digestHandler.EXPECT().HandleDigests(gomock.AssignableToTypeOf(new(types.Header)))
+
+	net := NewMockNetwork(ctrl)
+	net.EXPECT().GossipMessage(gomock.AssignableToTypeOf(new(network.TransactionMessage))).AnyTimes()
+	net.EXPECT().IsSynced().Return(true).AnyTimes()
+	net.EXPECT().ReportPeer(
+		gomock.AssignableToTypeOf(peerset.ReputationChange{}),
+		gomock.AssignableToTypeOf(peer.ID("")),
+	).AnyTimes()
+
 	cfg := &Config{
 		Keystore:         ks,
 		TransactionState: state.NewTransactionState(telemetryMock),
+		DigestHandler:    digestHandler,
+		Network:          net,
 	}
 
 	s := NewTestService(t, cfg)

dot/core/service.go

@@ -4,6 +4,7 @@
 package core
 
 import (
+	"bytes"
 	"context"
 	"math/big"
 	"sync"
@@ -20,7 +21,8 @@ import (
 	"github.com/ChainSafe/gossamer/lib/runtime/wasmer"
 	"github.com/ChainSafe/gossamer/lib/services"
 	"github.com/ChainSafe/gossamer/lib/transaction"
-	"github.com/ChainSafe/gossamer/pkg/scale"
+	cscale "github.com/centrifuge/go-substrate-rpc-client/v3/scale"
+	ctypes "github.com/centrifuge/go-substrate-rpc-client/v3/types"
 )
 
 var (
@@ -372,14 +374,9 @@ func (s *Service) handleChainReorg(prev, curr common.Hash) error {
 
 		for _, ext := range *body {
 			logger.Tracef("validating transaction on re-org chain for extrinsic %s", ext)
-			encExt, err := scale.Marshal(ext)
-			if err != nil {
-				return err
-			}
-
-			// decode extrinsic and make sure it's not an inherent.
-			decExt := &types.ExtrinsicData{}
-			if err = decExt.DecodeVersion(encExt); err != nil {
+			decExt := &ctypes.Extrinsic{}
+			decoder := cscale.NewDecoder(bytes.NewReader(ext))
+			if err = decoder.Decode(&decExt); err != nil {
 				continue
 			}
 
@@ -388,14 +385,13 @@ func (s *Service) handleChainReorg(prev, curr common.Hash) error {
 				continue
 			}
 
-			externalExt := types.Extrinsic(append([]byte{byte(types.TxnExternal)}, encExt...))
+			externalExt := types.Extrinsic(append([]byte{byte(types.TxnExternal)}, ext...))
 			txv, err := rt.ValidateTransaction(externalExt)
 			if err != nil {
 				logger.Debugf("failed to validate transaction for extrinsic %s: %s", ext, err)
 				continue
 			}
-
-			vtx := transaction.NewValidTransaction(encExt, txv)
+			vtx := transaction.NewValidTransaction(ext, txv)
 			s.transactionState.AddToPool(vtx)
 		}
 	}