fix(market): proposals are now estimated with 1h duration by default

golemfactory · Jul 5, 2024 · 11823b7 · 11823b7
1 parent ed1cf1d
commit 11823b7
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 8 deletions.
diff --git a/src/market/proposal/proposal.test.ts → src/market/proposal/offer-proposal.test.ts b/src/market/proposal/proposal.test.ts → src/market/proposal/offer-proposal.test.ts
@@ -24,7 +24,9 @@ const buildTestProposal = (props: Partial<ProposalProperties>): OfferProposal =>
   return new OfferProposal(model, testDemand);
 };
 
-describe("Proposal", () => {
+const SECONDS_IN_HOUR = 60 * 60;
+
+describe("Offer Proposal", () => {
   beforeEach(() => {
     reset(allocationMock);
     reset(demandMock);
@@ -144,19 +146,44 @@ describe("Proposal", () => {
 
   describe("Estimating cost", () => {
     test("it estimate cost based on CPU, Env and startup costs", () => {
+      const START_PRICE = 0.03;
+
       const proposal = buildTestProposal({
         "golem.inf.cpu.threads": 5,
         "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
-        "golem.com.pricing.model.linear.coeffs": [0.01, 0.02, 0.03],
+        "golem.com.pricing.model.linear.coeffs": [0.01, 0.02, START_PRICE],
       });
-      expect(proposal.getEstimatedCost()).toEqual(0.14);
+
+      const estimate = START_PRICE + 5 * SECONDS_IN_HOUR * 0.02 + SECONDS_IN_HOUR * 0.01;
+      expect(proposal.getEstimatedCost()).toEqual(estimate);
     });
+
     test("it estimate cost based on CPU, Env and startup costs if info about the number of threads is missing", () => {
+      const START_PRICE = 0.3;
       const proposal = buildTestProposal({
         "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
-        "golem.com.pricing.model.linear.coeffs": [0.1, 0.2, 0.3],
+        "golem.com.pricing.model.linear.coeffs": [0.1, 0.2, START_PRICE],
       });
-      expect(proposal.getEstimatedCost()).toEqual(0.6);
+
+      const estimate = START_PRICE + 1 * SECONDS_IN_HOUR * 0.2 + SECONDS_IN_HOUR * 0.1;
+      expect(proposal.getEstimatedCost()).toEqual(estimate);
+    });
+
+    test("it accepts user-provided rental time for estimation", () => {
+      const START_PRICE = 0.0;
+      const THREADS_COUNT = 2;
+
+      const proposal = buildTestProposal({
+        "golem.inf.cpu.threads": THREADS_COUNT,
+        "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
+        "golem.com.pricing.model.linear.coeffs": [0.01, 0.02, START_PRICE],
+      });
+
+      const rentHours = 2;
+      const estimate =
+        START_PRICE + rentHours * SECONDS_IN_HOUR * 0.02 * THREADS_COUNT + rentHours * SECONDS_IN_HOUR * 0.01;
+
+      expect(proposal.getEstimatedCost(rentHours)).toEqual(estimate);
     });
   });
 });
diff --git a/src/market/proposal/offer-proposal.ts b/src/market/proposal/offer-proposal.ts
@@ -98,10 +98,14 @@ export class OfferProposal extends MarketProposal {
 
   /**
    * Proposal cost estimation based on CPU, Env and startup costs
+   *
+   * @param rentHours Number of hours of rental to use for the estimation
    */
-  getEstimatedCost(): number {
-    const threadsNo = this.properties["golem.inf.cpu.threads"] || 1;
-    return this.pricing.start + this.pricing.cpuSec * threadsNo + this.pricing.envSec;
+  getEstimatedCost(rentHours = 1): number {
+    const threadsNo = this.properties["golem.inf.cpu.threads"] ?? 1;
+    const rentSeconds = rentHours * 60 * 60;
+
+    return this.pricing.start + this.pricing.cpuSec * threadsNo * rentSeconds + this.pricing.envSec * rentSeconds;
   }
 
   public get provider(): ProviderInfo {