chore: fixed examples

golemfactory · Jun 6, 2024 · 8c051ee · 8c051ee
1 parent 8b9a8bd
commit 8c051ee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/examples/advanced/hello-world.ts b/examples/advanced/hello-world.ts
@@ -1,5 +1,4 @@
 import { DraftOfferProposalPool, GolemNetwork, MarketOrderSpec } from "@golem-sdk/golem-js";
-
 import { pinoPrettyLogger } from "@golem-sdk/pino-logger";
 
 (async () => {
@@ -14,13 +13,6 @@ import { pinoPrettyLogger } from "@golem-sdk/pino-logger";
   try {
     await glm.connect();
 
-    const pricing = {
-      model: "linear",
-      maxStartPrice: 1,
-      maxCpuPerHourPrice: 1,
-      maxEnvPerHourPrice: 1,
-    };
-
     const order: MarketOrderSpec = {
       demand: {
         workload: {
@@ -30,7 +22,12 @@ import { pinoPrettyLogger } from "@golem-sdk/pino-logger";
       },
       market: {
         rentHours: 0.5,
-        pricing,
+        pricing: {
+          model: "linear",
+          maxStartPrice: 1,
+          maxCpuPerHourPrice: 1,
+          maxEnvPerHourPrice: 1,
+        },
       },
     };
 
@@ -45,7 +42,7 @@ import { pinoPrettyLogger } from "@golem-sdk/pino-logger";
     const demandSpecification = await glm.market.buildDemandDetails(order.demand, allocation);
     const draftProposal$ = glm.market.collectDraftOfferProposals({
       demandSpecification,
-      pricing,
+      pricing: order.market.pricing,
     });
     const proposalSubscription = proposalPool.readFrom(draftProposal$);
     const draftProposal = await proposalPool.acquire();

diff --git a/examples/advanced/local-image/serveLocalGvmi.ts b/examples/advanced/local-image/serveLocalGvmi.ts
@@ -1,4 +1,4 @@
-import { DraftOfferProposalPool, GolemNetwork } from "@golem-sdk/golem-js";
+import { DraftOfferProposalPool, GolemNetwork, MarketOrderSpec } from "@golem-sdk/golem-js";
 
 import { pinoPrettyLogger } from "@golem-sdk/pino-logger";
 import { fileURLToPath } from "url";
@@ -18,7 +18,7 @@ const getImagePath = (path: string) => fileURLToPath(new URL(path, import.meta.u
   try {
     await glm.connect();
 
-    const demand = {
+    const order: MarketOrderSpec = {
       demand: {
         workload: {
           // Here you supply the path to the GVMI file that you want to deploy and use
@@ -29,6 +29,7 @@ const getImagePath = (path: string) => fileURLToPath(new URL(path, import.meta.u
       market: {
         rentHours: 12,
         pricing: {
+          model: "linear",
           maxStartPrice: 1,
           maxCpuPerHourPrice: 1,
           maxEnvPerHourPrice: 1,
@@ -44,9 +45,10 @@ const getImagePath = (path: string) => fileURLToPath(new URL(path, import.meta.u
       budget: 1,
       expirationSec: 30 * 60, // 30 minutes
     });
-    const demandSpecification = await glm.market.buildDemandDetails(demand.demand, allocation);
+    const demandSpecification = await glm.market.buildDemandDetails(order.demand, allocation);
     const draftProposal$ = glm.market.collectDraftOfferProposals({
       demandSpecification,
+      pricing: order.market.pricing,
     });
     const proposalSubscription = proposalPool.readFrom(draftProposal$);
     const draftProposal = await proposalPool.acquire();

diff --git a/examples/advanced/manual-pools.ts b/examples/advanced/manual-pools.ts
@@ -20,10 +20,6 @@ const demandOptions = {
       maxCpuPerHourPrice: 1,
       maxEnvPerHourPrice: 1,
     },
-    withProviders: ["0x123123"],
-    withoutProviders: ["0x123123"],
-    withOperators: ["0x123123"],
-    withoutOperators: ["0x123123"],
   },
 } as const;
 
@@ -47,6 +43,7 @@ const demandOptions = {
 
     const draftProposal$ = glm.market.collectDraftOfferProposals({
       demandSpecification,
+      pricing: demandOptions.market.pricing,
     });
 
     const proposalSubscription = proposalPool.readFrom(draftProposal$);