wip

Author: benbierens

ProjectPlugins/CodexClient/CodexClient.csproj

@@ -30,7 +30,6 @@
     <ProjectReference Include="..\..\Framework\FileUtils\FileUtils.csproj" />
     <ProjectReference Include="..\..\Framework\Logging\Logging.csproj" />
     <ProjectReference Include="..\..\Framework\WebUtils\WebUtils.csproj" />
-    <ProjectReference Include="..\CodexContractsPlugin\CodexContractsPlugin.csproj" />
   </ItemGroup>
 
 </Project>

ProjectPlugins/CodexClient/StoragePurchaseContract.cs

@@ -1,5 +1,4 @@
 using CodexClient.Hooks;
-using CodexContractsPlugin.Marketplace;
 using Logging;
 using Newtonsoft.Json;
 using Utils;
@@ -15,7 +14,13 @@ public interface IStoragePurchaseContract
         void WaitForStorageContractSubmitted();
         void WaitForStorageContractStarted();
         void WaitForStorageContractFinished();
-        void WaitForContractFailed(MarketplaceConfig config);
+        void WaitForContractFailed(IMarketplaceConfigInput config);
+    }
+
+    public interface IMarketplaceConfigInput
+    {
+        int MaxNumberOfSlashes { get; }
+        TimeSpan PeriodDuration { get; }
     }
 
     public class StoragePurchaseContract : IStoragePurchaseContract
@@ -100,7 +105,7 @@ public void WaitForStorageContractFinished()
             AssertDuration(SubmittedToFinished, timeout, nameof(SubmittedToFinished));
         }
 
-        public void WaitForContractFailed(MarketplaceConfig config)
+        public void WaitForContractFailed(IMarketplaceConfigInput config)
         {
             if (!contractStartedUtc.HasValue)
             {
@@ -122,10 +127,10 @@ public void WaitForContractFailed(MarketplaceConfig config)
             WaitForStorageContractState(timeout, StoragePurchaseState.Failed);
         }
 
-        private TimeSpan TimeNeededToFailEnoughProofsToFreeASlot(MarketplaceConfig config)
+        private TimeSpan TimeNeededToFailEnoughProofsToFreeASlot(IMarketplaceConfigInput config)
         {
-            var numMissedProofsRequiredForFree = config.Collateral.MaxNumberOfSlashes;
-            var timePerProof = TimeSpan.FromSeconds(config.Proofs.Period);
+            var numMissedProofsRequiredForFree = config.MaxNumberOfSlashes;
+            var timePerProof = config.PeriodDuration;
             var result = timePerProof * (numMissedProofsRequiredForFree + 1);
 
             // Times 2!

ProjectPlugins/CodexContractsPlugin/ChainMonitor/PeriodMonitor.cs

@@ -1,15 +1,18 @@
-using Utils;
+using Logging;
+using Utils;
 
 namespace CodexContractsPlugin.ChainMonitor
 {
     public class PeriodMonitor
     {
+        private readonly ILog log;
         private readonly ICodexContracts contracts;
         private readonly List<PeriodReport> reports = new List<PeriodReport>();
         private ulong? currentPeriod = null;
 
-        public PeriodMonitor(ICodexContracts contracts)
+        public PeriodMonitor(ILog log, ICodexContracts contracts)
         {
+            this.log = log;
             this.contracts = contracts;
         }
 

ProjectPlugins/CodexContractsPlugin/Marketplace/Customizations.cs

@@ -2,6 +2,7 @@
 using BlockchainUtils;
 using Nethereum.Hex.HexConvertors.Extensions;
 using Newtonsoft.Json;
+using CodexClient;
 using Utils;
 
 namespace CodexContractsPlugin.Marketplace
@@ -92,5 +93,10 @@ public partial class ReserveSlotFunction : IHasBlock, IHasRequestId, IHasSlotInd
         [JsonIgnore]
         public BlockTimeEntry Block { get; set; }
     }
+
+    public partial class MarketplaceConfig : IMarketplaceConfigInput
+    {
+
+    }
 }
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.