Skip to content

Commit

Permalink
renamed mock settlement to local
Browse files Browse the repository at this point in the history
  • Loading branch information
mtsitrin committed Apr 4, 2024
1 parent 9733e1c commit e40db8c
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion block/manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion block/testutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion settlement/mock/mock.go → settlement/local/local.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mock
package local

import (
"context"
Expand Down
8 changes: 4 additions & 4 deletions settlement/registry/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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{} },
}
Expand Down
2 changes: 1 addition & 1 deletion settlement/registry/registry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions settlement/settlement_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)

Expand Down Expand Up @@ -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{
Expand All @@ -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()
Expand Down

0 comments on commit e40db8c

Please sign in to comment.