Skip to content

Commit

Permalink
fix(config): disable claimer on experimental mode
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelstanley committed Aug 7, 2024
1 parent a4acd64 commit 85c64fd
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 1 deletion.
2 changes: 2 additions & 0 deletions build/compose-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ services:
CARTESI_FEATURE_DISABLE_CLAIMER: "false"
CARTESI_HTTP_ADDRESS: "0.0.0.0"
CARTESI_HTTP_PORT: "10000"
CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_ENABLED: true
CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_REDIS_ENDPOINT: redis://default:[email protected]:6379
3 changes: 2 additions & 1 deletion internal/node/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,9 @@ func FromEnv() NodeConfig {
if getExperimentalSunodoValidatorEnabled() {
config.ExperimentalSunodoValidatorRedisEndpoint =
getExperimentalSunodoValidatorRedisEndpoint()
config.FeatureDisableClaimer = true
}
if !getFeatureDisableClaimer() && !getExperimentalSunodoValidatorEnabled() {
if !config.FeatureDisableClaimer && !getExperimentalSunodoValidatorEnabled() {
config.Auth = authFromEnv()
}
return config
Expand Down
36 changes: 36 additions & 0 deletions internal/node/config/config_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package config

import (
"os"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
)

type ConfigTestSuite struct {
suite.Suite
}

func (s *ConfigTestSuite) SetupSuite() {
os.Setenv("CARTESI_BLOCKCHAIN_ID", "31337")
os.Setenv("CARTESI_BLOCKCHAIN_HTTP_ENDPOINT", "http://localhost:8545")
os.Setenv("CARTESI_BLOCKCHAIN_WS_ENDPOINT", "ws://localhost:8545")
os.Setenv("CARTESI_CONTRACTS_APPLICATION_ADDRESS", "0x")
os.Setenv("CARTESI_CONTRACTS_HISTORY_ADDRESS", "0x")
os.Setenv("CARTESI_CONTRACTS_AUTHORITY_ADDRESS", "0x")
os.Setenv("CARTESI_CONTRACTS_INPUT_BOX_ADDRESS", "0x")
os.Setenv("CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER", "0")
os.Setenv("CARTESI_SNAPSHOT_DIR", "/tmp")
}

func TestConfigTest(t *testing.T) {
suite.Run(t, new(ConfigTestSuite))
}

func (s *ConfigTestSuite) TestSunodoExperimentalModeDisablesClaimer() {
os.Setenv("CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_ENABLED", "true")
os.Setenv("CARTESI_EXPERIMENTAL_SUNODO_VALIDATOR_REDIS_ENDPOINT", "redis://")
c := FromEnv()
assert.Equal(s.T(), true, c.FeatureDisableClaimer)
}

0 comments on commit 85c64fd

Please sign in to comment.