Merge branch 'development' into eclesio/sync-strategy

ChainSafe · Sep 13, 2024 · 2eda142 · 2eda142
2 parents 330444c + 7eba200
commit 2eda142
Show file tree

Hide file tree

Showing 33 changed files with 5,643 additions and 583 deletions.
diff --git a/dot/mock_node_builder_test.go b/dot/mock_node_builder_test.go
diff --git a/dot/node.go b/dot/node.go
@@ -61,7 +61,7 @@ type nodeBuilderIface interface {
 	) (*core.Service, error)
 	createGRANDPAService(config *cfg.Config, st *state.Service, ks KeyStore,
 		net *network.Service, telemetryMailer Telemetry) (*grandpa.Service, error)
-	newSyncService(config *cfg.Config, st *state.Service, finalityGadget BlockJustificationVerifier,
+	newSyncService(config *cfg.Config, st *state.Service, finalityGadget dotsync.FinalityGadget,
 		verifier *babe.VerificationManager, cs *core.Service, net *network.Service,
 		telemetryMailer Telemetry) (network.Syncer, error)
 	createBABEService(config *cfg.Config, st *state.Service, ks KeyStore, cs *core.Service,

diff --git a/dot/services.go b/dot/services.go
@@ -497,7 +497,7 @@ func (nodeBuilder) createBlockVerifier(st *state.Service) *babe.VerificationMana
 	return babe.NewVerificationManager(st.Block, st.Slot, st.Epoch)
 }
 
-func (nodeBuilder) newSyncService(config *cfg.Config, st *state.Service, fg BlockJustificationVerifier,
+func (nodeBuilder) newSyncService(config *cfg.Config, st *state.Service, fg sync.FinalityGadget,
 	verifier *babe.VerificationManager, cs *core.Service, net *network.Service, telemetryMailer Telemetry) (
 	network.Syncer, error) {
 	slotDuration, err := st.Epoch.GetSlotDuration()

diff --git a/dot/services_integration_test.go b/dot/services_integration_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/ChainSafe/gossamer/dot/network"
 	rpc "github.com/ChainSafe/gossamer/dot/rpc"
 	"github.com/ChainSafe/gossamer/dot/state"
+	"github.com/ChainSafe/gossamer/dot/sync"
 	"github.com/ChainSafe/gossamer/dot/telemetry"
 	"github.com/ChainSafe/gossamer/dot/types"
 	"github.com/ChainSafe/gossamer/internal/log"
@@ -373,7 +374,7 @@ func Test_nodeBuilder_newSyncService(t *testing.T) {
 	require.NoError(t, err)
 
 	type args struct {
-		fg              BlockJustificationVerifier
+		fg              sync.FinalityGadget
 		verifier        *babe.VerificationManager
 		cs              *core.Service
 		net             *network.Service