better naming for settlement config

dymensionxyz · May 16, 2024 · 20577e5 · 20577e5
1 parent 10c6ee9
commit 20577e5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/config/toml.go b/config/toml.go
@@ -113,10 +113,10 @@ settlement_layer = "{{ .SettlementLayer }}" # mock, dymension
 
 # dymension config
 rollapp_id = "{{ .SettlementConfig.RollappID }}"
-node_address = "{{ .SettlementConfig.NodeAddress }}"
-gas_limit = {{ .SettlementConfig.GasLimit }}
-gas_prices = "{{ .SettlementConfig.GasPrices }}"
-gas_fees = "{{ .SettlementConfig.GasFees }}"
+settlement_node_address = "{{ .SettlementConfig.NodeAddress }}"
+settlement_gas_limit = {{ .SettlementConfig.GasLimit }}
+settlement_gas_prices = "{{ .SettlementConfig.GasPrices }}"
+settlement_gas_fees = "{{ .SettlementConfig.GasFees }}"
 retry_max_delay = "{{ .SettlementConfig.RetryMaxDelay }}"
 retry_min_delay = "{{ .SettlementConfig.RetryMinDelay }}"
 retry_attempts = "{{ .SettlementConfig.RetryAttempts }}"

diff --git a/settlement/config.go b/settlement/config.go
@@ -8,13 +8,13 @@ import (
 // Config for the DymensionLayerClient
 type Config struct {
 	KeyringBackend         string        `mapstructure:"keyring_backend"`
-	NodeAddress            string        `mapstructure:"node_address"`
+	NodeAddress            string        `mapstructure:"settlement_node_address"`
 	KeyringHomeDir         string        `mapstructure:"keyring_home_dir"`
 	DymAccountName         string        `mapstructure:"dym_account_name"`
 	RollappID              string        `mapstructure:"rollapp_id"`
-	GasLimit               uint64        `mapstructure:"gas_limit"`
-	GasPrices              string        `mapstructure:"gas_prices"`
-	GasFees                string        `mapstructure:"gas_fees"`
+	GasLimit               uint64        `mapstructure:"settlement_gas_limit"`
+	GasPrices              string        `mapstructure:"settlement_gas_prices"`
+	GasFees                string        `mapstructure:"settlement_gas_fees"`
 	RetryAttempts          uint          `mapstructure:"retry_attempts"`
 	RetryMaxDelay          time.Duration `mapstructure:"retry_max_delay"`
 	RetryMinDelay          time.Duration `mapstructure:"retry_min_delay"`

diff --git a/settlement/dymension/dymension.go b/settlement/dymension/dymension.go
@@ -57,7 +57,6 @@ var _ settlement.LayerI = &LayerClient{}
 
 // Init is called once. it initializes the struct members.
 func (dlc *LayerClient) Init(config settlement.Config, pubsub *pubsub.Server, logger types.Logger, options ...settlement.Option) error {
-
 	DymensionCosmosClient, err := NewDymensionHubClient(config, pubsub, logger)
 	if err != nil {
 		return err