chore: introduce Submodule interface

Makefile

@@ -297,7 +297,7 @@ protogen_local: go_protoc-go-inject-tag ## Generate go structures for all of the
 	$(PROTOC_SHARED) -I=./consensus/types/proto --go_out=./consensus/types ./consensus/types/proto/*.proto
 
 	# P2P
-	$(PROTOC_SHARED) -I=./p2p/raintree/types/proto --go_out=./p2p/types ./p2p/raintree/types/proto/*.proto
+	$(PROTOC_SHARED) -I=./p2p/types/proto --go_out=./p2p/types ./p2p/types/proto/*.proto
 
 	# echo "View generated proto files by running: make protogen_show"
 

app/client/cli/consensus.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fmt"
+
 	"github.com/spf13/cobra"
 
 	"github.com/pokt-network/pocket/app/client/cli/flags"

app/client/cli/debug.go

@@ -228,7 +228,9 @@ func fetchPeerstore(cmd *cobra.Command) (typesP2P.Peerstore, error) {
 		return nil, errors.New("retrieving bus from CLI context")
 	}
 	modulesRegistry := bus.GetModulesRegistry()
-	pstoreProvider, err := modulesRegistry.GetModule(peerstore_provider.ModuleName)
+	// TECHDEBT(#810, #811): use `bus.GetPeerstoreProvider()` after peerstore provider
+	// is retrievable as a proper submodule
+	pstoreProvider, err := modulesRegistry.GetModule(peerstore_provider.PeerstoreProviderSubmoduleName)
 	if err != nil {
 		return nil, errors.New("retrieving peerstore provider")
 	}

app/client/cli/helpers/setup.go

@@ -27,24 +27,26 @@ func P2PDependenciesPreRunE(cmd *cobra.Command, _ []string) error {
 	bus := runtimeMgr.GetBus()
 	SetValueInCLIContext(cmd, BusCLICtxKey, bus)
 
-	setupPeerstoreProvider(*runtimeMgr, flags.RemoteCLIURL)
+	if err := setupPeerstoreProvider(*runtimeMgr, flags.RemoteCLIURL); err != nil {
+		return err
+	}
 	setupCurrentHeightProvider(*runtimeMgr, flags.RemoteCLIURL)
 	setupAndStartP2PModule(*runtimeMgr)
 
 	return nil
 }
 
-func setupPeerstoreProvider(rm runtime.Manager, rpcURL string) {
-	bus := rm.GetBus()
-	modulesRegistry := bus.GetModulesRegistry()
-	pstoreProvider := rpcPSP.Create(
-		rpcPSP.WithP2PConfig(rm.GetConfig().P2P),
-		rpcPSP.WithCustomRPCURL(rpcURL),
-	)
-	modulesRegistry.RegisterModule(pstoreProvider)
+func setupPeerstoreProvider(rm runtime.Manager, rpcURL string) error {
+	// Ensure `PeerstoreProvider` exists in the modules registry.
+	if _, err := rpcPSP.Create(rm.GetBus(), rpcPSP.WithCustomRPCURL(rpcURL)); err != nil {
+		return err
+	}
+	return nil
 }
 
 func setupCurrentHeightProvider(rm runtime.Manager, rpcURL string) {
+	// TECHDEBT(#810): simplify after current height provider is refactored as
+	// a submodule.
 	bus := rm.GetBus()
 	modulesRegistry := bus.GetModulesRegistry()
 	currentHeightProvider := rpcCHP.NewRPCCurrentHeightProvider(

consensus/events.go

@@ -4,7 +4,7 @@ import (
 	"github.com/pokt-network/pocket/shared/messaging"
 )
 
-// publishNewHeightEvent publishes a new height event to the bus so that other interested IntegratableModules can react to it if necessary
+// publishNewHeightEvent publishes a new height event to the bus so that other interested IntegrableModules can react to it if necessary
 func (m *consensusModule) publishNewHeightEvent(height uint64) {
 	newHeightEvent, err := messaging.PackMessage(&messaging.ConsensusNewHeightEvent{Height: height})
 	if err != nil {

consensus/leader_election/module.go

@@ -14,7 +14,7 @@ type LeaderElectionModule interface {
 var _ LeaderElectionModule = &leaderElectionModule{}
 
 type leaderElectionModule struct {
-	base_modules.IntegratableModule
+	base_modules.IntegrableModule
 	base_modules.InterruptableModule
 }
 

consensus/module.go

@@ -31,7 +31,7 @@ const (
 )
 
 type consensusModule struct {
-	base_modules.IntegratableModule
+	base_modules.IntegrableModule
 
 	privateKey cryptoPocket.Ed25519PrivateKey
 
@@ -209,7 +209,7 @@ func (m *consensusModule) GetModuleName() string {
 }
 
 func (m *consensusModule) SetBus(pocketBus modules.Bus) {
-	m.IntegratableModule.SetBus(pocketBus)
+	m.IntegrableModule.SetBus(pocketBus)
 	if m.paceMaker != nil {
 		m.paceMaker.SetBus(pocketBus)
 	}

consensus/pacemaker/module.go

@@ -45,7 +45,7 @@ type Pacemaker interface {
 }
 
 type pacemaker struct {
-	base_modules.IntegratableModule
+	base_modules.IntegrableModule
 	base_modules.InterruptableModule
 
 	pacemakerCfg    *configs.PacemakerConfig

ibc/module.go

@@ -11,7 +11,7 @@ import (
 var _ modules.IBCModule = &ibcModule{}
 
 type ibcModule struct {
-	base_modules.IntegratableModule
+	base_modules.IntegrableModule
 
 	cfg    *configs.IBCConfig
 	logger *modules.Logger

logger/module.go

@@ -14,7 +14,7 @@ import (
 var _ modules.Module = &loggerModule{}
 
 type loggerModule struct {
-	base_modules.IntegratableModule
+	base_modules.IntegrableModule
 	base_modules.InterruptableModule
 
 	zerolog.Logger