From 32f56e82130b82c3aa936a26c6272e3ef422bb0a Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 15 Mar 2024 16:07:10 +0100 Subject: [PATCH] Marketplace test fails: submitted proof is invalid. --- ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs | 3 +-- ProjectPlugins/CodexPlugin/MarketplaceAccess.cs | 11 ----------- Tests/CodexTests/BasicTests/ExampleTests.cs | 8 ++++---- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs b/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs index 4681259..4356556 100644 --- a/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs +++ b/ProjectPlugins/CodexPlugin/CodexContainerRecipe.cs @@ -9,8 +9,7 @@ namespace CodexPlugin { private readonly MarketplaceStarter marketplaceStarter = new MarketplaceStarter(); - private const string DefaultDockerImage = "thatbenbierens/nim-codex:prover2"; - //"codexstorage/nim-codex:latest-dist-tests"; + private const string DefaultDockerImage = "codexstorage/nim-codex:sha-ba0e7d9-dist-tests"; public const string ApiPortTag = "codex_api_port"; public const string ListenPortTag = "codex_listen_port"; public const string MetricsPortTag = "codex_metrics_port"; diff --git a/ProjectPlugins/CodexPlugin/MarketplaceAccess.cs b/ProjectPlugins/CodexPlugin/MarketplaceAccess.cs index 462f468..6077cee 100644 --- a/ProjectPlugins/CodexPlugin/MarketplaceAccess.cs +++ b/ProjectPlugins/CodexPlugin/MarketplaceAccess.cs @@ -181,17 +181,6 @@ namespace CodexPlugin WaitForStorageContractState(timeout, "finished"); } - /// - /// Wait for contract to start. Max timeout depends on contract filesize. Allows more time for larger files. - /// - public void WaitForStorageContractStarted(ByteSize contractFileSize) - { - var filesizeInMb = contractFileSize.SizeInBytes / (1024 * 1024); - var maxWaitTime = TimeSpan.FromSeconds(filesizeInMb * 10.0); - - WaitForStorageContractStarted(maxWaitTime); - } - public void WaitForStorageContractStarted(TimeSpan timeout) { WaitForStorageContractState(timeout, "started"); diff --git a/Tests/CodexTests/BasicTests/ExampleTests.cs b/Tests/CodexTests/BasicTests/ExampleTests.cs index 6e9ab5a..8db821a 100644 --- a/Tests/CodexTests/BasicTests/ExampleTests.cs +++ b/Tests/CodexTests/BasicTests/ExampleTests.cs @@ -66,8 +66,7 @@ namespace CodexTests.BasicTests .WithStorageQuota(11.GB()) .EnableMarketplace(geth, contracts, initialEth: 10.Eth(), initialTokens: sellerInitialBalance, s => s .AsStorageNode() - .AsValidator()) - .WithSimulateProofFailures(failEveryNProofs: 3)); + .AsValidator())); AssertBalance(contracts, seller, Is.EqualTo(sellerInitialBalance)); seller.Marketplace.MakeStorageAvailable( @@ -91,9 +90,10 @@ namespace CodexTests.BasicTests requiredCollateral: 10.TestTokens(), minRequiredNumberOfNodes: 1, proofProbability: 5, - duration: TimeSpan.FromMinutes(5)); + duration: TimeSpan.FromMinutes(5), + expiry: TimeSpan.FromMinutes(4)); - purchaseContract.WaitForStorageContractStarted(fileSize); + purchaseContract.WaitForStorageContractStarted(TimeSpan.FromMinutes(4)); AssertBalance(contracts, seller, Is.LessThan(sellerInitialBalance), "Collateral was not placed.");