diff --git a/testnet/launcher/l1contractdeployer/cmd/cli.go b/testnet/launcher/l1contractdeployer/cmd/cli.go index 28e734292..9bcebcf95 100644 --- a/testnet/launcher/l1contractdeployer/cmd/cli.go +++ b/testnet/launcher/l1contractdeployer/cmd/cli.go @@ -6,10 +6,10 @@ import ( // L1ContractDeployerConfigCLI represents the configurations passed into the deployer over CLI type L1ContractDeployerConfigCLI struct { - l1HTTPURL string - privateKey string - dockerImage string - challengePeriod int + l1HTTPURL string + privateKey string + dockerImage string + //challengePeriod int contractsEnvFile string } @@ -22,13 +22,13 @@ func ParseConfigCLI() *L1ContractDeployerConfigCLI { privateKey := flag.String(privateKeyFlag, "", flagUsageMap[privateKeyFlag]) dockerImage := flag.String(dockerImageFlag, "testnetobscuronet.azurecr.io/obscuronet/hardhatdeployer:latest", flagUsageMap[dockerImageFlag]) contractsEnvFile := flag.String(contractsEnvFileFlag, "", flagUsageMap[contractsEnvFileFlag]) - challengePeriod := flag.Int(challengePeriodFlag, 0, flagUsageMap[challengePeriodFlag]) + //challengePeriod := flag.Int(challengePeriodFlag, 0, flagUsageMap[challengePeriodFlag]) flag.Parse() cfg.l1HTTPURL = *l1HTTPURL cfg.privateKey = *privateKey cfg.dockerImage = *dockerImage - cfg.challengePeriod = *challengePeriod + //cfg.challengePeriod = *challengePeriod cfg.contractsEnvFile = *contractsEnvFile return cfg diff --git a/testnet/launcher/l1contractdeployer/cmd/cli_flags.go b/testnet/launcher/l1contractdeployer/cmd/cli_flags.go index aeff877c8..9d8466b1b 100644 --- a/testnet/launcher/l1contractdeployer/cmd/cli_flags.go +++ b/testnet/launcher/l1contractdeployer/cmd/cli_flags.go @@ -6,7 +6,7 @@ const ( privateKeyFlag = "private_key" dockerImageFlag = "docker_image" contractsEnvFileFlag = "contracts_env_file" - challengePeriodFlag = "l1_challenge_period" + //challengePeriodFlag = "l1_challenge_period" ) // Returns a map of the flag usages. @@ -17,6 +17,6 @@ func getFlagUsageMap() map[string]string { privateKeyFlag: "L1 and L2 private key used in the node", dockerImageFlag: "Docker image to run", contractsEnvFileFlag: "If set, it will write the contract addresses to the file", - challengePeriodFlag: "L1 delay when adding message bus root", + //challengePeriodFlag: "L1 delay when adding message bus root", } } diff --git a/testnet/launcher/l1contractdeployer/cmd/main.go b/testnet/launcher/l1contractdeployer/cmd/main.go index 5eb87339e..82c45f4b7 100644 --- a/testnet/launcher/l1contractdeployer/cmd/main.go +++ b/testnet/launcher/l1contractdeployer/cmd/main.go @@ -15,7 +15,7 @@ func main() { l1cd.WithL1HTTPURL(cliConfig.l1HTTPURL), // "http://eth2network:8025" l1cd.WithPrivateKey(cliConfig.privateKey), //"f52e5418e349dccdda29b6ac8b0abe6576bb7713886aa85abea6181ba731f9bb"), l1cd.WithDockerImage(cliConfig.dockerImage), //"testnetobscuronet.azurecr.io/obscuronet/hardhatdeployer:latest" - l1cd.WithChallengePeriod(cliConfig.challengePeriod), + //l1cd.WithChallengePeriod(cliConfig.challengePeriod), ), ) if err != nil { diff --git a/testnet/launcher/l1contractdeployer/config.go b/testnet/launcher/l1contractdeployer/config.go index f0182d2a1..159aaf327 100644 --- a/testnet/launcher/l1contractdeployer/config.go +++ b/testnet/launcher/l1contractdeployer/config.go @@ -5,11 +5,11 @@ type Option = func(c *Config) // Config holds the properties that configure the package type Config struct { - l1HTTPURL string - privateKey string - dockerImage string - challengePeriod int - debugEnabled bool + l1HTTPURL string + privateKey string + dockerImage string + //challengePeriod int + debugEnabled bool } func NewContractDeployerConfig(opts ...Option) *Config { @@ -40,11 +40,11 @@ func WithDockerImage(s string) Option { } } -func WithChallengePeriod(i int) Option { - return func(c *Config) { - c.challengePeriod = i - } -} +//func WithChallengePeriod(i int) Option { +// return func(c *Config) { +// c.challengePeriod = i +// } +//} func WithDebugEnabled(b bool) Option { return func(c *Config) {