From 2dc783af2ff4b87b7d4703f0fd133524ba4381de Mon Sep 17 00:00:00 2001
From: Michael Tsitrin <michael@dymension.xyz>
Date: Mon, 25 Mar 2024 22:23:57 +0200
Subject: [PATCH] removed from config

---
 block/testutil.go         | 2 --
 config/config.go          | 5 -----
 config/defaults.go        | 5 -----
 config/toml.go            | 5 -----
 node/integration_test.go  | 2 --
 node/testutils.go         | 2 --
 rpc/client/client_test.go | 4 ----
 rpc/json/service_test.go  | 2 --
 8 files changed, 27 deletions(-)

diff --git a/block/testutil.go b/block/testutil.go
index 375962414..93c409288 100644
--- a/block/testutil.go
+++ b/block/testutil.go
@@ -151,7 +151,5 @@ func getManagerConfig() config.BlockManagerConfig {
 		BatchSubmitMaxTime:      30 * time.Minute,
 		NamespaceID:             "0102030405060708",
 		GossipedBlocksCacheSize: 50,
-		OperatorKeyringBackend:  "memory",
-		OperatorAccountName:     "default",
 	}
 }
diff --git a/config/config.go b/config/config.go
index 8197f6af6..b16e918bc 100644
--- a/config/config.go
+++ b/config/config.go
@@ -53,11 +53,6 @@ type BlockManagerConfig struct {
 	BlockBatchMaxSizeBytes uint64 `mapstructure:"block_batch_max_size_bytes"`
 	// The number of messages cached by gossipsub protocol
 	GossipedBlocksCacheSize int `mapstructure:"gossiped_blocks_cache_size"`
-
-	// Parameters to get the sequencer's operator address
-	OperatorKeyringBackend string `mapstructure:"operator_keyring_backend"`
-	OperatorAccountName    string `mapstructure:"operator_account_name"`
-	OperatorKeyringHomeDir string `mapstructure:"operator_keyring_home_dir"`
 }
 
 // GetViperConfig reads configuration parameters from Viper instance.
diff --git a/config/defaults.go b/config/defaults.go
index 1efeb7f9c..3fa3fc08a 100644
--- a/config/defaults.go
+++ b/config/defaults.go
@@ -69,11 +69,6 @@ func DefaultConfig(home, chainId string) *NodeConfig {
 	}
 	cfg.SettlementConfig = defaultSLconfig
 
-	// set operator address
-	cfg.OperatorKeyringBackend = defaultSLconfig.KeyringBackend
-	cfg.OperatorKeyringHomeDir = defaultSLconfig.KeyringHomeDir
-	cfg.OperatorAccountName = defaultSLconfig.DymAccountName
-
 	//Setting default params for da grpc mock
 	defaultDAGrpc := grpc.Config{
 		Host: "127.0.0.1",
diff --git a/config/toml.go b/config/toml.go
index 10aa44f4f..4f9249dd9 100644
--- a/config/toml.go
+++ b/config/toml.go
@@ -111,11 +111,6 @@ keyring_home_dir = "{{ .SettlementConfig.KeyringHomeDir }}"
 dym_account_name = "{{ .SettlementConfig.DymAccountName }}"
 
 
-#keyring and key name to be used as sequencer's operator address on the rollapp  
-operator_keyring_backend = "{{ .BlockManagerConfig.OperatorKeyringBackend }}"
-operator_keyring_home_dir = "{{ .BlockManagerConfig.OperatorKeyringHomeDir }}"
-operator_account_name = "{{ .BlockManagerConfig.OperatorAccountName }}"
-
 #######################################################
 ###       Instrumentation Configuration Options     ###
 #######################################################
diff --git a/node/integration_test.go b/node/integration_test.go
index 8e257b629..293bbdb66 100644
--- a/node/integration_test.go
+++ b/node/integration_test.go
@@ -53,8 +53,6 @@ func TestAggregatorMode(t *testing.T) {
 		BlockBatchMaxSizeBytes:  1000,
 		NamespaceID:             "0102030405060708",
 		GossipedBlocksCacheSize: 50,
-		OperatorKeyringBackend:  "memory",
-		OperatorAccountName:     "default",
 	}
 
 	nodeConfig := config.NodeConfig{
diff --git a/node/testutils.go b/node/testutils.go
index 44398aade..62d4ca3ec 100644
--- a/node/testutils.go
+++ b/node/testutils.go
@@ -33,8 +33,6 @@ func CreateNode(isAggregator bool, blockManagerConfig *config.BlockManagerConfig
 			BatchSubmitMaxTime:      60 * time.Second,
 			BlockBatchMaxSizeBytes:  1000,
 			GossipedBlocksCacheSize: 50,
-			OperatorKeyringBackend:  "memory",
-			OperatorAccountName:     "default",
 		}
 	}
 	nodeConfig.BlockManagerConfig = *blockManagerConfig
diff --git a/rpc/client/client_test.go b/rpc/client/client_test.go
index 8def07273..cd87f4d8a 100644
--- a/rpc/client/client_test.go
+++ b/rpc/client/client_test.go
@@ -442,8 +442,6 @@ func TestTx(t *testing.T) {
 			BatchSubmitMaxTime:      60 * time.Second,
 			BlockBatchMaxSizeBytes:  1000,
 			GossipedBlocksCacheSize: 50,
-			OperatorKeyringBackend:  "memory",
-			OperatorAccountName:     "default",
 		},
 		BootstrapTime:    30 * time.Second,
 		SettlementConfig: settlement.Config{ProposerPubKey: hex.EncodeToString(pubKeybytes)},
@@ -713,8 +711,6 @@ func TestValidatorSetHandling(t *testing.T) {
 			BatchSubmitMaxTime:      60 * time.Second,
 			BlockBatchMaxSizeBytes:  1000,
 			GossipedBlocksCacheSize: 50,
-			OperatorKeyringBackend:  "memory",
-			OperatorAccountName:     "default",
 		},
 		BootstrapTime:    30 * time.Second,
 		SettlementConfig: settlement.Config{ProposerPubKey: hex.EncodeToString(proposerPubKeyBytes)},
diff --git a/rpc/json/service_test.go b/rpc/json/service_test.go
index 0fbc9656f..476bba249 100644
--- a/rpc/json/service_test.go
+++ b/rpc/json/service_test.go
@@ -304,8 +304,6 @@ func getRPC(t *testing.T) (*mocks.Application, *client.Client) {
 			BlockBatchSize:          10000,
 			BlockBatchMaxSizeBytes:  1000,
 			GossipedBlocksCacheSize: 50,
-			OperatorKeyringBackend:  "memory",
-			OperatorAccountName:     "default",
 		},
 		SettlementConfig: settlement.Config{
 			ProposerPubKey: hex.EncodeToString(proposerPubKeyBytes)},