Removes genesis json.

DistTestCore/CodexNodeGroup.cs

@@ -78,8 +78,8 @@ namespace DistTestCore
             }
             catch (Exception e)
             {
-                lifecycle.Log.Error($"Failed to start codex node: {e}");
+                lifecycle.Log.Error($"Failed to start codex node: {e}. Test infra failure.");
-                throw;
+                throw new InvalidOperationException($"Failed to start codex node. Test infra failure.", e);
             }
         }
     }

DistTestCore/Marketplace/ContainerInfoExtractor.cs

@@ -23,14 +23,6 @@ namespace DistTestCore.Marketplace
             return account;
         }
 
-        public string ExtractGenesisJsonBase64()
-        {
-            var genesisJson = Retry(FetchGenesisJson);
-            if (string.IsNullOrEmpty(genesisJson)) throw new InvalidOperationException("Unable to fetch genesis-json for geth node. Test infra failure.");
-
-            return Convert.ToBase64String(Encoding.ASCII.GetBytes(genesisJson));
-        }
-
         public string ExtractPubKey()
         {
             var pubKey = Retry(FetchPubKey);
@@ -78,11 +70,6 @@ namespace DistTestCore.Marketplace
             }
         }
 
-        private string FetchGenesisJson()
-        {
-            return workflow.ExecuteCommand(container, "cat", GethContainerRecipe.GenesisFilename);
-        }
-
         private string FetchAccount()
         {
             return workflow.ExecuteCommand(container, "cat", GethContainerRecipe.AccountFilename);

DistTestCore/Marketplace/GethBootstrapNodeInfo.cs

@@ -6,11 +6,10 @@ namespace DistTestCore.Marketplace
 {
     public class GethBootstrapNodeInfo
     {
-        public GethBootstrapNodeInfo(RunningContainers runningContainers, string account, string genesisJsonBase64, string pubKey, string privateKey, Port discoveryPort)
+        public GethBootstrapNodeInfo(RunningContainers runningContainers, string account, string pubKey, string privateKey, Port discoveryPort)
         {
             RunningContainers = runningContainers;
             Account = account;
-            GenesisJsonBase64 = genesisJsonBase64;
             PubKey = pubKey;
             PrivateKey = privateKey;
             DiscoveryPort = discoveryPort;
@@ -18,7 +17,6 @@ namespace DistTestCore.Marketplace
 
         public RunningContainers RunningContainers { get; }
         public string Account { get; }
-        public string GenesisJsonBase64 { get; }
         public string PubKey { get; }
         public string PrivateKey { get; }
         public Port DiscoveryPort { get; }

DistTestCore/Marketplace/GethBootstrapNodeStarter.cs

@@ -4,8 +4,6 @@ namespace DistTestCore.Marketplace
 {
     public class GethBootstrapNodeStarter : BaseStarter
     {
-        private const string bootstrapGenesisJsonBase64 = "ewogICAgImNvbmZpZyI6IHsKICAgICAgImNoYWluSWQiOiA3ODk5ODgsCiAgICAgICJob21lc3RlYWRCbG9jayI6IDAsCiAgICAgICJlaXAxNTBCbG9jayI6IDAsCiAgICAgICJlaXAxNTVCbG9jayI6IDAsCiAgICAgICJlaXAxNThCbG9jayI6IDAsCiAgICAgICJieXphbnRpdW1CbG9jayI6IDAsCiAgICAgICJjb25zdGFudGlub3BsZUJsb2NrIjogMCwKICAgICAgInBldGVyc2J1cmdCbG9jayI6IDAsCiAgICAgICJpc3RhbmJ1bEJsb2NrIjogMCwKICAgICAgIm11aXJHbGFjaWVyQmxvY2siOiAwLAogICAgICAiYmVybGluQmxvY2siOiAwLAogICAgICAibG9uZG9uQmxvY2siOiAwLAogICAgICAiYXJyb3dHbGFjaWVyQmxvY2siOiAwLAogICAgICAiZ3JheUdsYWNpZXJCbG9jayI6IDAsCiAgICAgICJjbGlxdWUiOiB7CiAgICAgICAgInBlcmlvZCI6IDUsCiAgICAgICAgImVwb2NoIjogMzAwMDAKICAgICAgfQogICAgfSwKICAgICJkaWZmaWN1bHR5IjogIjEiLAogICAgImdhc0xpbWl0IjogIjgwMDAwMDAwMCIsCiAgICAiZXh0cmFkYXRhIjogIjB4MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMEFDQ09VTlRfSEVSRTAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiLAogICAgImFsbG9jIjogewogICAgICAiMHhBQ0NPVU5UX0hFUkUiOiB7ICJiYWxhbmNlIjogIjUwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAiIH0KICAgIH0KICB9";
-
         public GethBootstrapNodeStarter(TestLifecycle lifecycle, WorkflowCreator workflowCreator)
             : base(lifecycle, workflowCreator)
         {
@@ -23,20 +21,19 @@ namespace DistTestCore.Marketplace
 
             var extractor = new ContainerInfoExtractor(workflow, bootstrapContainer);
             var account = extractor.ExtractAccount();
-            var genesisJsonBase64 = extractor.ExtractGenesisJsonBase64();
             var pubKey = extractor.ExtractPubKey();
             var privateKey = extractor.ExtractBootstrapPrivateKey();
             var discoveryPort = bootstrapContainer.Recipe.GetPortByTag(GethContainerRecipe.DiscoveryPortTag);
 
             LogEnd($"Geth bootstrap node started with account '{account}'");
 
-            return new GethBootstrapNodeInfo(containers, account, genesisJsonBase64, pubKey, privateKey, discoveryPort);
+            return new GethBootstrapNodeInfo(containers, account, pubKey, privateKey, discoveryPort);
         }
 
         private StartupConfig CreateBootstrapStartupConfig()
         {
             var config = new StartupConfig();
-            config.Add(new GethStartupConfig(true, bootstrapGenesisJsonBase64, null!));
+            config.Add(new GethStartupConfig(true, null!));
             return config;
         }
     }

DistTestCore/Marketplace/GethCompanionNodeStarter.cs

@@ -34,7 +34,7 @@ namespace DistTestCore.Marketplace
         private StartupConfig CreateCompanionNodeStartupConfig(GethBootstrapNodeInfo bootstrapNode)
         {
             var config = new StartupConfig();
-            config.Add(new GethStartupConfig(false, bootstrapNode.GenesisJsonBase64, bootstrapNode));
+            config.Add(new GethStartupConfig(false, bootstrapNode));
             return config;
         }
     }

DistTestCore/Marketplace/GethContainerRecipe.cs

@@ -9,7 +9,6 @@ namespace DistTestCore.Marketplace
         public const string WsPortTag = "ws_port";
         public const string DiscoveryPortTag = "disc_port";
         public const string AccountFilename = "account_string.txt";
-        public const string GenesisFilename = "genesis.json";
         public const string BootstrapPrivateKeyFilename = "bootstrap_private.key";
 
         protected override string Image => DockerImage;
@@ -21,7 +20,6 @@ namespace DistTestCore.Marketplace
             var args = CreateArgs(config);
 
             AddEnvVar("GETH_ARGS", args);
-            AddEnvVar("GENESIS_JSON", config.GenesisJsonBase64);
         }
 
         private string CreateArgs(GethStartupConfig config)

DistTestCore/Marketplace/GethStartupConfig.cs

@@ -2,15 +2,13 @@
 {
     public class GethStartupConfig
     {
-        public GethStartupConfig(bool isBootstrapNode, string genesisJsonBase64, GethBootstrapNodeInfo bootstrapNode)
+        public GethStartupConfig(bool isBootstrapNode, GethBootstrapNodeInfo bootstrapNode)
         {
             IsBootstrapNode = isBootstrapNode;
-            GenesisJsonBase64 = genesisJsonBase64;
             BootstrapNode = bootstrapNode;
         }
 
         public bool IsBootstrapNode { get; }
-        public string GenesisJsonBase64 { get; }
         public GethBootstrapNodeInfo BootstrapNode { get; }
     }
 }