style: rename local hub settlement to local instead of mock

block/manager_test.go

@@ -43,7 +43,7 @@ func TestInitialState(t *testing.T) {
 	err = pubsubServer.Start()
 	require.NoError(t, err)
 	proxyApp := testutil.GetABCIProxyAppMock(logger.With("module", "proxy"))
-	settlementlc := slregistry.GetClient(slregistry.Mock)
+	settlementlc := slregistry.GetClient(slregistry.Local)
 	_ = settlementlc.Init(settlement.Config{}, pubsubServer, logger)
 
 	// Init empty store and full store

block/testutil.go

@@ -17,7 +17,7 @@ import (
 
 	"github.com/dymensionxyz/dymint/config"
 	"github.com/dymensionxyz/dymint/da"
-	mockda "github.com/dymensionxyz/dymint/da/mock"
+	localda "github.com/dymensionxyz/dymint/da/local"
 	mempoolv1 "github.com/dymensionxyz/dymint/mempool/v1"
 	nodemempool "github.com/dymensionxyz/dymint/node/mempool"
 	slregistry "github.com/dymensionxyz/dymint/settlement/registry"
@@ -57,7 +57,7 @@ func getManagerWithProposerKey(conf config.BlockManagerConfig, proposerKey crypt
 
 	// Init the settlement layer mock
 	if settlementlc == nil {
-		settlementlc = slregistry.GetClient(slregistry.Mock)
+		settlementlc = slregistry.GetClient(slregistry.Local)
 	}
 
 	proposerPubKey := proposerKey.GetPublic()
@@ -72,7 +72,7 @@ func getManagerWithProposerKey(conf config.BlockManagerConfig, proposerKey crypt
 	}
 
 	if dalc == nil {
-		dalc = &mockda.DataAvailabilityLayerClient{}
+		dalc = &localda.DataAvailabilityLayerClient{}
 	}
 	initDALCMock(dalc, pubsubServer, logger)
 
@@ -123,7 +123,7 @@ func getManager(conf config.BlockManagerConfig, settlementlc settlement.LayerI,
 
 // TODO(omritoptix): Possible move out to a generic testutil
 func getMockDALC(logger log.Logger) da.DataAvailabilityLayerClient {
-	dalc := &mockda.DataAvailabilityLayerClient{}
+	dalc := &localda.DataAvailabilityLayerClient{}
 	initDALCMock(dalc, pubsub.NewServer(), logger)
 	return dalc
 }

da/celestia/mock/server.go

@@ -15,15 +15,15 @@
 
 	"github.com/celestiaorg/go-cnc"
 	"github.com/dymensionxyz/dymint/da"
-	mockda "github.com/dymensionxyz/dymint/da/mock"
+	"github.com/dymensionxyz/dymint/da/local"
 	"github.com/dymensionxyz/dymint/log"
 	"github.com/dymensionxyz/dymint/store"
 	"github.com/dymensionxyz/dymint/types"
 )
 
 // Server mocks celestia-node HTTP API.
 type Server struct {
-	mock      *mockda.DataAvailabilityLayerClient
+	da        *local.DataAvailabilityLayerClient
 	blockTime time.Duration
 	server    *http.Server
 	logger    log.Logger
@@ -32,19 +32,19 @@
 // NewServer creates new instance of Server.
 func NewServer(blockTime time.Duration, logger log.Logger) *Server {
 	return &Server{
-		mock:      new(mockda.DataAvailabilityLayerClient),
+		da:        new(local.DataAvailabilityLayerClient),
 		blockTime: blockTime,
 		logger:    logger,
 	}
 }
 
 // Start starts HTTP server with given listener.
 func (s *Server) Start(listener net.Listener) error {
-	err := s.mock.Init([]byte(s.blockTime.String()), pubsub.NewServer(), store.NewDefaultInMemoryKVStore(), s.logger)
+	err := s.da.Init([]byte(s.blockTime.String()), pubsub.NewServer(), store.NewDefaultInMemoryKVStore(), s.logger)
 	if err != nil {
 		return err
 	}
-	err = s.mock.Start()
+	err = s.da.Start()
 	if err != nil {
 		return err
 	}
@@ -93,7 +93,7 @@
 		return
 	}
 
-	res := s.mock.SubmitBatch(&batch)
+	res := s.da.SubmitBatch(&batch)
 	code := 0
 	if res.Code != da.StatusSuccess {
 		code = 3
@@ -122,7 +122,7 @@
 	daMetaData := &da.DASubmitMetaData{
 		Height: height,
 	}
-	res := s.mock.RetrieveBatches(daMetaData)
+	res := s.da.RetrieveBatches(daMetaData)
 	if res.Code != da.StatusSuccess {
 		s.writeError(w, errors.New(res.Message))
 		return
@@ -167,7 +167,7 @@
 	daMetaData := &da.DASubmitMetaData{
 		Height: height,
 	}
-	res := s.mock.RetrieveBatches(daMetaData)
+	res := s.da.RetrieveBatches(daMetaData)
 	if res.Code != da.StatusSuccess {
 		s.writeError(w, errors.New(res.Message))
 		return

da/da_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/dymensionxyz/dymint/da"
 	"github.com/dymensionxyz/dymint/da/celestia"
-	"github.com/dymensionxyz/dymint/da/mock"
+	"github.com/dymensionxyz/dymint/da/local"
 	"github.com/dymensionxyz/dymint/da/registry"
 	"github.com/dymensionxyz/dymint/store"
 	"github.com/dymensionxyz/dymint/types"
@@ -59,11 +59,11 @@ func doTestDALC(t *testing.T, mockDalc da.DataAvailabilityLayerClient) {
 	var err error
 
 	// mock DALC will advance block height every 100ms
-	if _, ok := mockDalc.(*mock.DataAvailabilityLayerClient); !ok {
-		t.Fatal("mock DALC is not of type *mock.DataAvailabilityLayerClient")
+	if _, ok := mockDalc.(*local.DataAvailabilityLayerClient); !ok {
+		t.Fatal("mock DALC is not of type *local.DataAvailabilityLayerClient")
 	}
 	conf := []byte(mockDaBlockTime.String())
-	dalc := mockDalc.(*mock.DataAvailabilityLayerClient)
+	dalc := mockDalc.(*local.DataAvailabilityLayerClient)
 
 	pubsubServer := pubsub.NewServer()
 	err = pubsubServer.Start()
@@ -132,7 +132,7 @@ func doTestRetrieve(t *testing.T, dalc da.DataAvailabilityLayerClient) {
 
 	// mock DALC will advance block height every 100ms
 	conf := []byte{}
-	if _, ok := dalc.(*mock.DataAvailabilityLayerClient); ok {
+	if _, ok := dalc.(*local.DataAvailabilityLayerClient); ok {
 		conf = []byte(mockDaBlockTime.String())
 	}
 	if _, ok := dalc.(*celestia.DataAvailabilityLayerClient); ok {

da/grpc/mockserv/mockserv.go

@@ -9,7 +9,7 @@
 
 	"github.com/dymensionxyz/dymint/da"
 	grpcda "github.com/dymensionxyz/dymint/da/grpc"
-	"github.com/dymensionxyz/dymint/da/mock"
+	"github.com/dymensionxyz/dymint/da/local"
 	"github.com/dymensionxyz/dymint/store"
 	"github.com/dymensionxyz/dymint/types"
 	"github.com/dymensionxyz/dymint/types/pb/dalc"
@@ -23,12 +23,12 @@
 
 	srv := grpc.NewServer()
 	mockImpl := &mockImpl{}
-	err := mockImpl.mock.Init(mockConfig, pubsub.NewServer(), kv, logger)
+	err := mockImpl.da.Init(mockConfig, pubsub.NewServer(), kv, logger)
 	if err != nil {
 		logger.Error("failed to initialize mock DALC", "error", err)
 		panic(err)
 	}
-	err = mockImpl.mock.Start()
+	err = mockImpl.da.Start()
 	if err != nil {
 		logger.Error("failed to start mock DALC", "error", err)
 		panic(err)
@@ -38,7 +38,7 @@
 }
 
 type mockImpl struct {
-	mock mock.DataAvailabilityLayerClient
+	da local.DataAvailabilityLayerClient
 }
 
 func (m *mockImpl) SubmitBatch(_ context.Context, request *dalc.SubmitBatchRequest) (*dalc.SubmitBatchResponse, error) {
@@ -47,7 +47,7 @@
 	if err != nil {
 		return nil, err
 	}
-	resp := m.mock.SubmitBatch(&b)
+	resp := m.da.SubmitBatch(&b)
 	return &dalc.SubmitBatchResponse{
 		Result: &dalc.DAResponse{
 			Code:            dalc.StatusCode(resp.Code),
@@ -62,7 +62,7 @@
 	daMetaData := &da.DASubmitMetaData{
 		Height: request.DataLayerHeight,
 	}
-	resp := m.mock.CheckBatchAvailability(daMetaData)
+	resp := m.da.CheckBatchAvailability(daMetaData)
 	return &dalc.CheckBatchAvailabilityResponse{
 		Result: &dalc.DAResponse{
 			Code:    dalc.StatusCode(resp.Code),
@@ -75,7 +75,7 @@
 	dataMetaData := &da.DASubmitMetaData{
 		Height: request.DataLayerHeight,
 	}
-	resp := m.mock.RetrieveBatches(dataMetaData)
+	resp := m.da.RetrieveBatches(dataMetaData)
 	batches := make([]*dymint.Batch, len(resp.Batches))
 	for i := range resp.Batches {
 		batches[i] = resp.Batches[i].ToProto()

da/mock/mock.go → da/local/local.go

@@ -1,4 +1,4 @@
-package mock
+package local
 
 import (
 	"crypto/sha1" //#nosec

da/registry/registry.go

@@ -5,12 +5,12 @@ import (
 	"github.com/dymensionxyz/dymint/da/avail"
 	"github.com/dymensionxyz/dymint/da/celestia"
 	"github.com/dymensionxyz/dymint/da/grpc"
-	"github.com/dymensionxyz/dymint/da/mock"
+	"github.com/dymensionxyz/dymint/da/local"
 )
 
 // this is a central registry for all Data Availability Layer Clients
 var clients = map[string]func() da.DataAvailabilityLayerClient{
-	"mock":     func() da.DataAvailabilityLayerClient { return &mock.DataAvailabilityLayerClient{} },
+	"mock":     func() da.DataAvailabilityLayerClient { return &local.DataAvailabilityLayerClient{} },
 	"grpc":     func() da.DataAvailabilityLayerClient { return &grpc.DataAvailabilityLayerClient{} },
 	"celestia": func() da.DataAvailabilityLayerClient { return &celestia.DataAvailabilityLayerClient{} },
 	"avail":    func() da.DataAvailabilityLayerClient { return &avail.DataAvailabilityLayerClient{} },

settlement/mock/mock.go → settlement/local/local.go

@@ -1,4 +1,4 @@
-package mock
+package local
 
 import (
 	"context"

settlement/registry/registry.go

@@ -4,15 +4,15 @@ import (
 	"github.com/dymensionxyz/dymint/settlement"
 	"github.com/dymensionxyz/dymint/settlement/dymension"
 	"github.com/dymensionxyz/dymint/settlement/grpc"
-	"github.com/dymensionxyz/dymint/settlement/mock"
+	"github.com/dymensionxyz/dymint/settlement/local"
 )
 
 // Client represents a settlement layer client
 type Client string
 
 const (
-	// Mock is a mock client for the settlement layer
-	Mock Client = "mock"
+	// Local is a mock client for the settlement layer
+	Local Client = "mock"
 	// Dymension is a client for interacting with dymension settlement layer
 	Dymension Client = "dymension"
 	// Mock client using grpc for a shared use
@@ -21,7 +21,7 @@ const (
 
 // A central registry for all Settlement Layer Clients
 var clients = map[Client]func() settlement.LayerI{
-	Mock:      func() settlement.LayerI { return &mock.LayerClient{} },
+	Local:     func() settlement.LayerI { return &local.LayerClient{} },
 	Dymension: func() settlement.LayerI { return &dymension.LayerClient{} },
 	Grpc:      func() settlement.LayerI { return &grpc.LayerClient{} },
 }

settlement/registry/registry_test.go

@@ -10,7 +10,7 @@ import (
 func TestRegistery(t *testing.T) {
 	assert := assert.New(t)
 
-	expected := []registry.Client{registry.Mock, registry.Dymension, registry.Grpc}
+	expected := []registry.Client{registry.Local, registry.Dymension, registry.Grpc}
 	actual := registry.RegisteredClients()
 
 	assert.ElementsMatch(expected, actual)

settlement/settlement_test.go

@@ -25,7 +25,7 @@ const batchSize = 5
 
 func TestLifecycle(t *testing.T) {
 	var err error
-	client := registry.GetClient(registry.Mock)
+	client := registry.GetClient(registry.Local)
 	require := require.New(t)
 
 	pubsubServer := pubsub.NewServer()
@@ -45,7 +45,7 @@ func TestSubmitAndRetrieve(t *testing.T) {
 	require := require.New(t)
 	assert := assert.New(t)
 
-	settlementClient := registry.GetClient(registry.Mock)
+	settlementClient := registry.GetClient(registry.Local)
 
 	initClient(t, settlementClient)
 
@@ -99,7 +99,7 @@ func TestSubmitAndRetrieve(t *testing.T) {
 
 func TestGetSequencersEmptyList(t *testing.T) {
 	var err error
-	settlementClient := registry.GetClient(registry.Mock)
+	settlementClient := registry.GetClient(registry.Local)
 	hubClientMock := mocks.NewHubClient(t)
 	hubClientMock.On("GetSequencers", tsmock.Anything, tsmock.Anything).Return(nil, settlement.ErrNoSequencerForRollapp)
 	options := []settlement.Option{
@@ -125,7 +125,7 @@ func TestGetSequencers(t *testing.T) {
 	options := []settlement.Option{
 		settlement.WithHubClient(hubClientMock),
 	}
-	settlementClient := registry.GetClient(registry.Mock)
+	settlementClient := registry.GetClient(registry.Local)
 	initClient(t, settlementClient, options...)
 
 	sequencersList := settlementClient.GetSequencersList()

testutil/mocks.go

@@ -11,7 +11,7 @@ import (
 	"github.com/tendermint/tendermint/proxy"
 
 	"github.com/dymensionxyz/dymint/da"
-	mockda "github.com/dymensionxyz/dymint/da/mock"
+	localda "github.com/dymensionxyz/dymint/da/local"
 	"github.com/dymensionxyz/dymint/store"
 )
 
@@ -137,7 +137,7 @@ const connectionRefusedErrorMessage = "connection refused"
 
 // DALayerClientSubmitBatchError is a mock data availability layer client that can be used to test error handling
 type DALayerClientSubmitBatchError struct {
-	mockda.DataAvailabilityLayerClient
+	localda.DataAvailabilityLayerClient
 }
 
 // SubmitBatch submits a batch to the data availability layer
@@ -147,7 +147,7 @@ func (s *DALayerClientSubmitBatchError) SubmitBatch(_ *types.Batch) da.ResultSub
 
 // DALayerClientRetrieveBatchesError is a mock data availability layer client that can be used to test error handling
 type DALayerClientRetrieveBatchesError struct {
-	mockda.DataAvailabilityLayerClient
+	localda.DataAvailabilityLayerClient
 }
 
 // RetrieveBatches retrieves batches from the data availability layer