Merge branch 'beta' into feature/JST-883/payment-in-pools

src/experimental/new-api/builder.test.ts → src/deployment/builder.test.ts

@@ -1,6 +1,6 @@
-import { GolemConfigError } from "../../shared/error/golem-error";
+import { GolemConfigError } from "../shared/error/golem-error";
 import { GolemDeploymentBuilder } from "./builder";
-import { GolemNetwork } from "../../golem-network";
+import { GolemNetwork } from "../golem-network";
 import { imock } from "@johanblumenberg/ts-mockito";
 
 const mockGolemNetwork = imock<GolemNetwork>();

src/experimental/new-api/builder.ts → src/deployment/builder.ts

@@ -1,11 +1,11 @@
-import { GolemConfigError } from "../../shared/error/golem-error";
-import { NetworkOptions } from "../../network";
+import { GolemConfigError } from "../shared/error/golem-error";
+import { NetworkOptions } from "../network";
 import { Deployment, DeploymentComponents } from "./deployment";
-import { GolemNetwork } from "../../golem-network";
+import { GolemNetwork } from "../golem-network";
 import { validateDeployment } from "./validate-deployment";
-import { MarketOptions } from "../../market";
-import { PaymentModuleOptions } from "../../payment";
-import { BuildDemandOptions } from "../../market/demand";
+import { MarketOptions } from "../market";
+import { PaymentModuleOptions } from "../payment";
+import { BuildDemandOptions } from "../market/demand";
 
 interface DeploymentOptions {
   replicas?: number | { min: number; max: number };

src/experimental/new-api/deployment.ts → src/deployment/deployment.ts

@@ -1,15 +1,15 @@
-import { GolemAbortError, GolemUserError } from "../../shared/error/golem-error";
-import { defaultLogger, Logger, YagnaApi } from "../../shared/utils";
+import { GolemAbortError, GolemUserError } from "../shared/error/golem-error";
+import { defaultLogger, Logger, YagnaApi } from "../shared/utils";
 import { EventEmitter } from "eventemitter3";
-import { ActivityModule } from "../../activity";
-import { Network, NetworkOptions } from "../../network";
-import { GftpStorageProvider, StorageProvider, WebSocketBrowserStorageProvider } from "../../shared/storage";
+import { ActivityModule } from "../activity";
+import { Network, NetworkOptions } from "../network";
+import { GftpStorageProvider, StorageProvider, WebSocketBrowserStorageProvider } from "../shared/storage";
 import { validateDeployment } from "./validate-deployment";
-import { DemandBuildParams, DraftOfferProposalPool, MarketModule } from "../../market";
-import { PaymentModule } from "../../payment";
-import { LeaseProcessPool, LeaseProcessPoolOptions } from "../../agreement";
+import { DemandBuildParams, DraftOfferProposalPool, MarketModule } from "../market";
+import { PaymentModule } from "../payment";
 import { CreateActivityPoolOptions } from "./builder";
 import { Subscription } from "rxjs";
+import { LeaseProcessPool, LeaseProcessPoolOptions } from "../agreement";
 
 export enum DeploymentState {
   INITIAL = "INITIAL",

src/deployment/index.ts

@@ -0,0 +1,2 @@
+export * from "./deployment";
+export * from "./builder";

src/experimental/new-api/validate-deployment.ts → src/deployment/validate-deployment.ts

@@ -1,4 +1,4 @@
-import { GolemConfigError } from "../../shared/error/golem-error";
+import { GolemConfigError } from "../shared/error/golem-error";
 import { DeploymentComponents } from "./deployment";
 
 function validateNetworks(components: DeploymentComponents) {

src/experimental.ts

@@ -1,3 +1,2 @@
 export * from "./experimental/job";
 export * from "./experimental/reputation";
-export * from "./experimental/new-api";

src/experimental/index.ts

@@ -1 +1,2 @@
-export * from "./new-api";
+export * from "./job";
+export * from "./reputation";

src/golem-network.ts

@@ -1,4 +1,4 @@
-import { DataTransferProtocol, DeploymentOptions, GolemDeploymentBuilder, MarketOptions } from "./experimental";
+import { DataTransferProtocol, DeploymentOptions, GolemDeploymentBuilder } from "./deployment";
 import { defaultLogger, Logger, YagnaApi } from "./shared/utils";
 import {
   Demand,
@@ -7,6 +7,7 @@ import {
   MarketApi,
   MarketModule,
   MarketModuleImpl,
+  MarketOptions,
   OfferProposal,
 } from "./market";
 import { PaymentModule, PaymentModuleImpl, PaymentModuleOptions } from "./payment";

src/index.ts

@@ -1,5 +1,6 @@
 //  High-level entry points
 export * from "./golem-network";
+export * from "./deployment";
 
 // Low level entry points for advanced users
 export * from "./market";

tests/import/import.test.mjs

@@ -5,7 +5,7 @@ describe("ESM Import", () => {
   });
 
   test("Import @golem-sdk/golem-js/experimental", async () => {
-    const { GolemNetwork } = await import("@golem-sdk/golem-js/experimental");
-    expect(typeof GolemNetwork).toBe("function");
+    const { Job } = await import("@golem-sdk/golem-js/experimental");
+    expect(typeof Job).toBe("function");
   });
 });

tests/import/require.test.cjs

@@ -5,7 +5,7 @@ describe("CommonJS Import", () => {
   });
 
   test("Require @golem-sdk/golem-js/experimental", async () => {
-    const { GolemNetwork } = require("@golem-sdk/golem-js/experimental");
-    expect(typeof GolemNetwork).toBe("function");
+    const { Job } = require("@golem-sdk/golem-js/experimental");
+    expect(typeof Job).toBe("function");
   });
 });