refactor: removing deprecated methods

* chore(payment): removed deprecated acceptDebitNotes method
* refactor: fixed remaining usage of a removed method
* refactor: removing deprecated methods

BREAKING CHANGE:
* `PaymentService.acceptDebitNote` is no longer available, use `acceptPayments` instead.
* Deprecated `isSubprocess` TaskExecutor option is now removed.
* Deprecated `TaskExecutor.end` is now removed (use `TaskExecutor.shutdown` instead)
* Deprecated `TaskExecutor.beforeEach` is now removed (use `TaskExecutor.onActivityReady` instead)
* Deprecated `WorkContext.rejectResult` method is removed.

examples/docs-examples/examples/transferring-data/transfer-data-in-browser.html

@@ -124,7 +124,7 @@ <h3>Logs</h3>
           })
           .catch((e) => logger.error(e));
 
-        await executor.end();
+        await executor.shutdown();
         if (result?.data) setResponse(result.data);
       }
       document.getElementById("RUN").onclick = run;

examples/docs-examples/examples/transferring-data/upload-json-in-browser.html

@@ -44,7 +44,7 @@
             appendResults(JSON.stringify(output.data.output, null, "\t"));
           })
           .catch((e) => logger.error(e));
-        await executor.end();
+        await executor.shutdown();
       }
       document.getElementById("echo").onclick = run;
     </script>

examples/docs-examples/quickstarts/web-quickstart/requestor.mjs

@@ -35,7 +35,7 @@ async function run() {
   } catch (error) {
     logger.error("Computation failed:", error);
   } finally {
-    await executor.end();
+    await executor.shutdown();
   }
 }
 

examples/docs-examples/tutorials/accessing-internet/outbound-ipfs.mjs

@@ -28,6 +28,6 @@ const url = "https://ipfs.io/ipfs/bafybeihkoviema7g3gxyt6la7vd5ho32ictqbilu3wnlo
   } catch (err) {
     console.error("The task failed due to", err);
   } finally {
-    await executor.end();
+    await executor.shutdown();
   }
 })();

examples/docs-examples/tutorials/running-from-browser/index.html

@@ -71,7 +71,7 @@ <h3>Logs</h3>
         await executor
           .run(async (ctx) => appendResults((await ctx.run("echo 'Hello World'")).stdout))
           .catch((e) => logger.error(e));
-        await executor.end();
+        await executor.shutdown();
       }
       document.getElementById("echo").onclick = run;
     </script>

examples/simple-usage/spawn.ts

@@ -12,4 +12,4 @@ const finalResult = await executor.run(async (ctx) => {
 
 console.log(finalResult);
 
-await executor.end();
+await executor.shutdown();

src/executor/executor.ts

@@ -40,11 +40,6 @@ export type ExecutorOptions = {
   maxTaskRetries?: number;
   /** Custom Storage Provider used for transfer files */
   storageProvider?: StorageProvider;
-  /**
-   * @deprecated this parameter will be removed in the next version.
-   * Currently, has no effect on executor termination.
-   */
-  isSubprocess?: boolean;
   /** Timeout for preparing activity - creating and deploy commands */
   activityPreparingTimeout?: number;
   /**
@@ -276,17 +271,6 @@ export class TaskExecutor {
     this.events.emit("ready");
   }
 
-  /**
-   * Stop all executor services and shut down executor instance.
-   *
-   * You can call this method multiple times, it will resolve only once the executor is shutdown.
-   *
-   * @deprecated Use TaskExecutor.shutdown() instead.
-   */
-  end(): Promise<void> {
-    return this.shutdown();
-  }
-
   /**
    * Stop all executor services and shut down executor instance.
    *
@@ -337,32 +321,6 @@ export class TaskExecutor {
     return this.statsService.getStatsTree();
   }
 
-  /**
-   * @deprecated
-   * Use {@link TaskExecutor.onActivityReady} instead.
-   *
-   * Define worker function that will be runs before every each computation Task, within the same activity.
-   *
-   * @param worker worker function - task
-   * @example
-   * ```typescript
-   * executor.beforeEach(async (ctx) => {
-   *   await ctx.uploadFile("./params.txt", "/params.txt");
-   * });
-   *
-   * await executor.forEach([1, 2, 3, 4, 5], async (ctx, item) => {
-   *    await ctx
-   *      .beginBatch()
-   *      .run(`/run_some_command.sh --input ${item} --params /input_params.txt --output /output.txt`)
-   *      .downloadFile("/output.txt", "./output.txt")
-   *      .end();
-   * });
-   * ```
-   */
-  beforeEach(worker: Worker<unknown>) {
-    this.activityReadySetupFunctions = [worker];
-  }
-
   /**
    * Registers a worker function that will be run when an activity is ready.
    * This is the perfect place to run setup functions that need to be run only once per

src/market/proposal.ts

@@ -18,14 +18,6 @@ export type ProposalProperties = Record<string, string | number | string[] | num
   "golem.com.payment.platform.erc20-polygon-glm.address"?: string;
   "golem.com.payment.platform.erc20-holesky-tglm.address"?: string;
   "golem.com.payment.platform.erc20-mumbai-tglm.address"?: string;
-  /**
-   * @deprecated rinkeby is no longer supported, use other test networks instead
-   */
-  "golem.com.payment.platform.erc20-rinkeby-tglm.address"?: string;
-  /**
-   * @deprecated rinkeby is no longer supported, use other test networks instead
-   */
-  "golem.com.payment.platform.zksync-rinkeby-tglm.address"?: string;
   "golem.com.pricing.model": "linear";
   "golem.com.pricing.model.linear.coeffs": number[];
   "golem.com.scheme": string;

src/payment/service.ts

@@ -130,19 +130,6 @@ export class PaymentService {
     );
   }
 
-  /**
-   * @deprecated, Use `acceptPayments` instead
-   */
-  // Reason: We will remove this in 2.0
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  acceptDebitNotes(_agreementId: string) {
-    this.logger.warn(
-      "PaymentService.acceptDebitNotes is deprecated and will be removed in the next major version. " +
-        "Use PaymentService.acceptPayments which now also deal with debit notes.",
-    );
-    return;
-  }
-
   private getNumberOfUnpaidAgreements() {
     const inProgress = [...this.processes.values()].filter((p) => !p.isFinished());
 

src/task/work.ts

@@ -254,13 +254,6 @@ export class WorkContext {
     return Batch.create(this.activity, this.storageProvider, this.logger);
   }
 
-  /**
-   * @Deprecated This function is only used to throw errors from unit tests. It should be removed.
-   */
-  rejectResult(msg: string) {
-    throw new GolemError(`Work rejected. Reason: ${msg}`);
-  }
-
   getWebsocketUri(port: number): string {
     if (!this.networkNode) throw new GolemError("There is no network in this work context");
     return this.networkNode.getWebsocketUri(port);

tests/mock/services/payment.ts

@@ -1,5 +1,5 @@
-import { Allocation } from "../../../src/payment/allocation";
-import { PaymentService } from "../../../src/payment";
+import { Allocation } from "../../../src/payment";
+import { PaymentService } from "../../../src";
 import { allocationMock } from "../../mock";
 import { Agreement } from "../../../src/agreement";
 
@@ -16,7 +16,4 @@ export const paymentServiceMock: PaymentService = {
   acceptPayments(agreement: Agreement) {
     return true;
   },
-  acceptDebitNotes(agreementId: string) {
-    return true;
-  },
 };

tests/unit/tasks_service.test.ts

@@ -124,40 +124,6 @@ describe("Task Service", () => {
     );
   });
 
-  it("should reject task by user", async () => {
-    const worker = async (ctx: WorkContext) => {
-      const result = await ctx.run("some_shell_command");
-      if (result.stdout === "invalid_value") ctx.rejectResult("Invalid value computed by provider");
-    };
-    const task = new Task("1", worker, { maxRetries: 2 });
-    queue.addToEnd(task);
-    activityMock.setExpectedExeResults([{ result: "Ok", stdout: "invalid_value" }]);
-    const service = new TaskService(
-      new YagnaMock().getApi(),
-      queue,
-      agreementPoolServiceMock,
-      paymentServiceMock,
-      networkServiceMock,
-      {
-        logger,
-        taskRunningInterval: 10,
-        activityStateCheckingInterval: 10,
-      },
-    );
-    service.run().catch((e) => console.error(e));
-
-    await logger.expectToInclude(
-      "Task has been rejected",
-      {
-        taskId: task.id,
-        reason: "Work rejected. Reason: Invalid value computed by provider",
-      },
-      1500,
-    );
-    expect(task.isFinished()).toEqual(true);
-    await service.end();
-  });
-
   it("should reject task if it failed max attempts", async () => {
     const worker = async (ctx: WorkContext) => ctx.run("some_shell_command");
     const task = new Task("1", worker, { maxRetries: 1 });