From fd012196f87610fbfd2347d5437f9bb61406b137 Mon Sep 17 00:00:00 2001 From: Eric <5089238+emizzle@users.noreply.github.com> Date: Thu, 14 Sep 2023 15:11:04 +1000 Subject: [PATCH] cleanup --- DistTestCore/Codex/CodexContainerRecipe.cs | 8 +------- DistTestCore/CodexSetup.cs | 12 +----------- .../Marketplace/CodexContractsContainerRecipe.cs | 1 - 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/DistTestCore/Codex/CodexContainerRecipe.cs b/DistTestCore/Codex/CodexContainerRecipe.cs index 08cca75..4d3570e 100644 --- a/DistTestCore/Codex/CodexContainerRecipe.cs +++ b/DistTestCore/Codex/CodexContainerRecipe.cs @@ -79,10 +79,7 @@ namespace DistTestCore.Codex { AddEnvVar("CODEX_SIMULATE_PROOF_FAILURES", config.SimulateProofFailures.ToString()!); } - // if (config.EnableValidator == true) - // { - // AddEnvVar("CODEX_VALIDATOR", "true"); - // } + if (config.MarketplaceConfig != null) { var gethConfig = startupConfig.Get(); @@ -103,9 +100,6 @@ namespace DistTestCore.Codex AddEnvVar("CODEX_VALIDATOR", "true"); } } - // if (config.MarketplaceConfig != null) { - // AddEnvVar("CODEX_PERSISTENCE", "true"); - // } if(!string.IsNullOrEmpty(config.NameOverride)) { AddEnvVar("CODEX_NODENAME", config.NameOverride); diff --git a/DistTestCore/CodexSetup.cs b/DistTestCore/CodexSetup.cs index 83dc11c..3e7bd8c 100644 --- a/DistTestCore/CodexSetup.cs +++ b/DistTestCore/CodexSetup.cs @@ -28,10 +28,6 @@ namespace DistTestCore /// Provides an invalid proof every N proofs /// ICodexSetup WithSimulateProofFailures(uint failEveryNProofs); - /// - /// Enables the validation module in the node - /// - // ICodexSetup WithValidator(); } public class CodexSetup : CodexStartupConfig, ICodexSetup @@ -112,7 +108,7 @@ namespace DistTestCore public ICodexSetup EnableMarketplace(TestToken initialBalance, Ether initialEther) { - return EnableMarketplace(initialBalance, initialEther, false); + return EnableMarketplace(initialBalance, initialEther, false); } public ICodexSetup EnableMarketplace(TestToken initialBalance, Ether initialEther, bool isValidator) @@ -127,12 +123,6 @@ namespace DistTestCore return this; } - // public ICodexSetup WithValidator() - // { - // EnableValidator = true; - // return this; - // } - public string Describe() { var args = string.Join(',', DescribeArgs()); diff --git a/DistTestCore/Marketplace/CodexContractsContainerRecipe.cs b/DistTestCore/Marketplace/CodexContractsContainerRecipe.cs index 8de0bc7..bd2c906 100644 --- a/DistTestCore/Marketplace/CodexContractsContainerRecipe.cs +++ b/DistTestCore/Marketplace/CodexContractsContainerRecipe.cs @@ -4,7 +4,6 @@ namespace DistTestCore.Marketplace { public class CodexContractsContainerRecipe : DefaultContainerRecipe { - public const string DockerImage = "codexstorage/dist-tests-codex-contracts-eth:sha-b4e4897"; public const string MarketplaceAddressFilename = "/hardhat/deployments/codexdisttestnetwork/Marketplace.json"; public const string MarketplaceArtifactFilename = "/hardhat/artifacts/contracts/Marketplace.sol/Marketplace.json";