chore: naming fixes and separation of DemandRequestBody and DemandBod…

…yPrototype

src/experimental/new-api/deployment.ts

@@ -171,7 +171,7 @@ export class Deployment {
 
       const proposalSubscription = this.modules.market
         .startCollectingProposals({
-          demandSpecification: demandSpecification,
+          demandSpecification,
           bufferSize: 10,
         })
         .subscribe({

src/golem-network.ts

@@ -241,7 +241,7 @@ export class GolemNetwork {
 
     const proposalSubscription = this.market
       .startCollectingProposals({
-        demandSpecification: demandSpecification,
+        demandSpecification,
       })
       .subscribe((proposalsBatch) => proposalsBatch.forEach((proposal) => proposalPool.add(proposal)));
 

src/market/demand.ts

@@ -1,7 +1,7 @@
 import { ActivityDemandDirectorConfigOptions } from "./demand/options";
 import { BasicDemandDirectorConfigOptions } from "./demand/directors/basic-demand-director-config";
 import { PaymentDemandDirectorConfigOptions } from "./demand/directors/payment-demand-director-config";
-import { DemandBodyPrototype } from "./demand/demand-details-builder";
+import { DemandBodyPrototype } from "./demand/demand-body-builder";
 
 /**
  * This type represents a set of *parameters* that the SDK can set to particular *properties* and *constraints*

src/market/demand/demand-details-builder.ts → src/market/demand/demand-body-builder.ts

@@ -53,7 +53,7 @@ export enum ComparisonOperator {
  *
  * Demand -> DemandSpecification -> DemandPrototype -> DemandDTO
  */
-export class DemandDetailsBuilder {
+export class DemandBodyBuilder {
   private properties: Array<DemandProperty> = [];
   private constraints: Array<DemandConstraint> = [];
 

src/market/demand/directors/activity-demand-director.test.ts

@@ -1,10 +1,10 @@
-import { DemandDetailsBuilder } from "../demand-details-builder";
+import { DemandBodyBuilder } from "../demand-body-builder";
 import { ActivityDemandDirector } from "./activity-demand-director";
 import { ActivityDemandDirectorConfig } from "./activity-demand-director-config";
 
 describe("ActivityDemandDirector", () => {
   test("should create properties with task_package and package_format", async () => {
-    const builder = new DemandDetailsBuilder();
+    const builder = new DemandBodyBuilder();
 
     const director = new ActivityDemandDirector(
       new ActivityDemandDirectorConfig({
@@ -28,7 +28,7 @@ describe("ActivityDemandDirector", () => {
   });
 
   test("should create package with manifest decorations", async () => {
-    const builder = new DemandDetailsBuilder();
+    const builder = new DemandBodyBuilder();
 
     const manifest = "XNBdCI6ICIyMTAwLTAxLTAxVDAwOjAxOjAwLjAwMDAwMFoiLAogICJtZXRhZGF0YSI6IHsKICAgICJuYW1lI=";
     const manifestSig = "GzbdJDaW6FTajVYCKKZZvwpwVNBK3o40r/okna87wV9CVWW0+WUFwe=";

src/market/demand/directors/activity-demand-director.ts

@@ -1,13 +1,13 @@
 import { ActivityDemandDirectorConfig } from "./activity-demand-director-config";
-import { ComparisonOperator, DemandDetailsBuilder } from "../demand-details-builder";
+import { ComparisonOperator, DemandBodyBuilder } from "../demand-body-builder";
 import { GolemError, GolemPlatformError } from "../../../shared/error/golem-error";
 import { IDemandDirector } from "../../market.module";
 import { EnvUtils } from "../../../shared/utils";
 
 export class ActivityDemandDirector implements IDemandDirector {
   constructor(private config: ActivityDemandDirectorConfig) {}
 
-  public async apply(builder: DemandDetailsBuilder) {
+  public async apply(builder: DemandBodyBuilder) {
     builder
       .addProperty("golem.srv.comp.vm.package_format", this.config.packageFormat)
       .addConstraint("golem.runtime.name", this.config.engine);
@@ -75,7 +75,7 @@ export class ActivityDemandDirector implements IDemandDirector {
     }
   }
 
-  private addManifestDecorations(builder: DemandDetailsBuilder): void {
+  private addManifestDecorations(builder: DemandBodyBuilder): void {
     if (!this.config.manifest) return;
     builder.addProperty("golem.srv.comp.payload", this.config.manifest);
     if (this.config.manifestSig) builder.addProperty("golem.srv.comp.payload.sig", this.config.manifestSig);

src/market/demand/directors/basic-demand-director.ts

@@ -1,11 +1,11 @@
-import { DemandDetailsBuilder } from "../demand-details-builder";
+import { DemandBodyBuilder } from "../demand-body-builder";
 import { IDemandDirector } from "../../market.module";
 import { BasicDemandDirectorConfig } from "./basic-demand-director-config";
 
 export class BasicDemandDirector implements IDemandDirector {
   constructor(private config: BasicDemandDirectorConfig = new BasicDemandDirectorConfig()) {}
 
-  apply(builder: DemandDetailsBuilder) {
+  apply(builder: DemandBodyBuilder) {
     builder
       .addProperty("golem.srv.caps.multi-activity", true)
       .addProperty("golem.srv.comp.expiration", Date.now() + this.config.expirationSec * 1000)

src/market/demand/directors/payment-demand-director.ts

@@ -1,5 +1,5 @@
 import { PayerDetails } from "../../../payment/PayerDetails";
-import { ComparisonOperator, DemandDetailsBuilder } from "../demand-details-builder";
+import { ComparisonOperator, DemandBodyBuilder } from "../demand-body-builder";
 import { IDemandDirector } from "../../market.module";
 import { PaymentDemandDirectorConfig } from "./payment-demand-director-config";
 
@@ -9,7 +9,7 @@ export class PaymentDemandDirector implements IDemandDirector {
     private config: PaymentDemandDirectorConfig = new PaymentDemandDirectorConfig(),
   ) {}
 
-  apply(builder: DemandDetailsBuilder) {
+  apply(builder: DemandBodyBuilder) {
     // Configure mid-agreement payments
     builder
       .addProperty("golem.com.scheme.payu.debit-note.interval-sec?", this.config.midAgreementDebitNoteIntervalSec)

src/market/market.module.test.ts

@@ -68,24 +68,54 @@ describe("Market module", () => {
         "(golem.inf.cpu.threads>=1)",
         "(golem.com.payment.platform.erc20-holesky-tglm.address=*)",
         "(golem.com.payment.protocol.version>1)",
-      ].join("\n\t");
+      ];
 
-      const expectedProperties = {
-        "golem.srv.comp.vm.package_format": "gvmkit-squash",
-        "golem.srv.comp.task_package": "hash:sha3:AAAAHASHAAAA:https://custom.image.url/",
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0x123",
-        "golem.com.payment.protocol.version": "2",
-        "golem.srv.caps.multi-activity": true,
-        "golem.srv.comp.expiration": Date.now() + 42 * 1000,
-        "golem.node.debug.subnet": "public",
-        "golem.com.payment.debit-notes.accept-timeout?": 42,
-        "golem.com.scheme.payu.debit-note.interval-sec?": 42,
-        "golem.com.scheme.payu.payment-timeout-sec?": 42,
-      };
+      const expectedProperties = [
+        {
+          key: "golem.srv.caps.multi-activity",
+          value: true,
+        },
+        {
+          key: "golem.srv.comp.expiration",
+          value: Date.now() + 42 * 1000,
+        },
+        {
+          key: "golem.node.debug.subnet",
+          value: "public",
+        },
+        {
+          key: "golem.srv.comp.vm.package_format",
+          value: "gvmkit-squash",
+        },
+        {
+          key: "golem.srv.comp.task_package",
+          value: "hash:sha3:AAAAHASHAAAA:https://custom.image.url/",
+        },
+        {
+          key: "golem.com.scheme.payu.debit-note.interval-sec?",
+          value: 42,
+        },
+        {
+          key: "golem.com.scheme.payu.payment-timeout-sec?",
+          value: 42,
+        },
+        {
+          key: "golem.com.payment.debit-notes.accept-timeout?",
+          value: 42,
+        },
+        {
+          key: "golem.com.payment.platform.erc20-holesky-tglm.address",
+          value: "0x123",
+        },
+        {
+          key: "golem.com.payment.protocol.version",
+          value: "2",
+        },
+      ];
 
       expect(demandSpecification.paymentPlatform).toBe(payerDetails.getPaymentPlatform());
       expect(demandSpecification.expirationSec).toBe(42);
-      expect(demandSpecification.prototype.constraints).toEqual(`(&${expectedConstraints})`);
+      expect(demandSpecification.prototype.constraints).toEqual(expect.arrayContaining(expectedConstraints));
       expect(demandSpecification.prototype.properties).toEqual(expectedProperties);
     });
   });
@@ -293,7 +323,7 @@ describe("Market module", () => {
       const draftProposals: ProposalNew[] = [];
       marketModule
         .startCollectingProposals({
-          demandSpecification: demandSpecification,
+          demandSpecification,
           bufferSize: 1,
           proposalsBatchReleaseTimeoutMs: 10,
         })
@@ -390,7 +420,7 @@ describe("Market module", () => {
       const draftProposals: ProposalNew[] = [];
       marketModule
         .startCollectingProposals({
-          demandSpecification: demandSpecification,
+          demandSpecification,
           bufferSize: 1,
           proposalsBatchReleaseTimeoutMs: 10,
         })

src/market/market.module.ts

@@ -13,7 +13,7 @@ import { defaultLogger, Logger, YagnaApi } from "../shared/utils";
 import { Allocation } from "../payment";
 import { bufferTime, filter, map, Observable, OperatorFunction, switchMap, tap } from "rxjs";
 import { IProposalRepository, ProposalFilterNew, ProposalNew } from "./proposal";
-import { DemandDetailsBuilder } from "./demand/demand-details-builder";
+import { DemandBodyBuilder } from "./demand/demand-body-builder";
 import { IAgreementApi } from "../agreement/agreement";
 import { BuildDemandOptions, DemandSpecification, IDemandRepository } from "./demand";
 import { ProposalsBatch } from "./proposals_batch";
@@ -168,7 +168,7 @@ export interface MarketModule {
  * all the final demand request body properties in a more controlled and organized manner.
  */
 export interface IDemandDirector {
-  apply(builder: DemandDetailsBuilder): Promise<void> | void;
+  apply(builder: DemandBodyBuilder): Promise<void> | void;
 }
 
 export class MarketModuleImpl implements MarketModule {
@@ -206,7 +206,7 @@ export class MarketModuleImpl implements MarketModule {
   }
 
   async buildDemandDetails(options: BuildDemandOptions, payerDetails: PayerDetails): Promise<DemandSpecification> {
-    const builder = new DemandDetailsBuilder();
+    const builder = new DemandBodyBuilder();
 
     // Instruct the builder what's required
     const basicConfig = new BasicDemandDirectorConfig(options.basic);

src/market/proposal.ts

@@ -4,7 +4,7 @@ import { ProviderInfo } from "../agreement";
 import { Demand } from "./demand";
 import { withTimeout } from "../shared/utils/timeout";
 import { EventEmitter } from "eventemitter3";
-import { DemandBodyPrototype, DemandPropertyValue } from "./demand/demand-details-builder";
+import { DemandBodyPrototype, DemandPropertyValue } from "./demand/demand-body-builder";
 import { DemandRequestBody } from "../shared/yagna";
 
 export type ProposalFilterNew = (proposal: ProposalNew) => boolean;