Change devnet and env var (to master branch) (#261)

* Change devnet-beta.2 to devnet.beta * Change YAGNA_NETWORK to YAGNA_PAYMENT_NETWORK
golemfactory · Sep 23, 2021 · f370bb6 · f370bb6
1 parent 0d97192
commit f370bb6
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/examples/blender/blender.js b/examples/blender/blender.js
@@ -86,7 +86,7 @@ async function main(subnetTag, driver, network) {
 }
 
 program
-  .option("--subnet-tag <subnet>", "set subnet name", "devnet-beta.2")
+  .option("--subnet-tag <subnet>", "set subnet name", "devnet-beta")
   .option("--driver <driver>", "payment driver name, for example 'zksync'", "zksync")
   .option("--network <network>", "network name, for example 'rinkeby'", "rinkeby")
   .option("-d, --debug", "output extra debugging");

diff --git a/examples/blender/blender.ts b/examples/blender/blender.ts
@@ -86,7 +86,7 @@ async function main(subnetTag: string, driver?: string, network?: string) {
 }
 
 program
-  .option("--subnet-tag <subnet>", "set subnet name, for example 'devnet-beta.2'")
+  .option("--subnet-tag <subnet>", "set subnet name, for example 'devnet-beta'")
   .option("--driver <driver>", "payment driver name, for example 'zksync'")
   .option("--network <network>", "network name, for example 'rinkeby'")
   .option("-d, --debug", "output extra debugging");

diff --git a/examples/hello-world/hello.js b/examples/hello-world/hello.js
@@ -16,7 +16,7 @@ async function main() {
   }
 
   await asyncWith(
-    new Executor({ task_package: package, budget: "1.0", subnet_tag: "devnet-beta.2" }),
+    new Executor({ task_package: package, budget: "1.0", subnet_tag: "devnet-beta" }),
     async (executor) => {
       for await (let completed of executor.submit(worker, tasks)) {
         console.log(completed.result().stdout);

diff --git a/examples/low-level-api/listOffers.js b/examples/low-level-api/listOffers.js
@@ -45,7 +45,7 @@ const promiseTimeout = (seconds) =>
     }, seconds * 1000)
   );
 
-program.option('--subnet-tag <subnet>', 'set subnet name', 'devnet-beta.2');
+program.option('--subnet-tag <subnet>', 'set subnet name', 'devnet-beta');
 program.parse(process.argv);
 console.log(`Using subnet: ${program.subnetTag}`);
 

diff --git a/examples/low-level-api/listOffers.ts b/examples/low-level-api/listOffers.ts
@@ -46,7 +46,7 @@ const promiseTimeout = (seconds: number): Promise<void> =>
     }, seconds * 1000)
   );
 
-program.option('--subnet-tag <subnet>', 'set subnet name', 'devnet-beta.2');
+program.option('--subnet-tag <subnet>', 'set subnet name', 'devnet-beta');
 program.parse(process.argv);
 console.log(`Using subnet: ${program.subnetTag}`);
 

diff --git a/examples/yacat/yacat.ts b/examples/yacat/yacat.ts
@@ -133,7 +133,7 @@ async function main(args) {
 }
 
 program
-  .option("--subnet-tag <subnet>", "set subnet name, for example 'devnet-beta.2'")
+  .option("--subnet-tag <subnet>", "set subnet name, for example 'devnet-beta'")
   .option("--driver <driver>", "payment driver name, for example 'zksync'")
   .option("--network <network>", "network name, for example 'rinkeby'")
   .option("-d, --debug", "output extra debugging")

diff --git a/yajsapi/executor/index.ts b/yajsapi/executor/index.ts
@@ -68,9 +68,9 @@ const DEFAULT_EXECUTOR_TIMEOUT: number = dayjs
   .duration({ minutes: 15 })
   .asMilliseconds()
 
-const DEFAULT_NETWORK: string = process.env["YAGNA_NETWORK"] || "rinkeby";
+const DEFAULT_NETWORK: string = process.env["YAGNA_PAYMENT_NETWORK"] || "rinkeby";
 const DEFAULT_DRIVER: string = process.env["YAGNA_PAYMENT_DRIVER"] || "zksync";
-const DEFAULT_SUBNET: string = process.env["YAGNA_SUBNET"] || "devnet-beta.2";
+const DEFAULT_SUBNET: string = process.env["YAGNA_SUBNET"] || "devnet-beta";
 
 export class NoPaymentAccountError extends Error {
   //"The error raised if no payment account for the required driver/network is available."
@@ -181,7 +181,7 @@ export class Executor {
    * @param strategy        market strategy used to select providers from the market (e.g. LeastExpensiveLinearPayuMS or DummyMS)
    * @param subnet_tag      use only providers in the subnet with the subnet_tag name (env variable equivalent: YAGNA_SUBNET)
    * @param driver          name of the payment driver to use or null to use the default driver; only payment platforms with the specified driver will be used (env variable equivalent: YAGNA_PAYMENT_DRIVER)
-   * @param network         name of the network to use or null to use the default network; only payment platforms with the specified network will be used (env variable equivalent: YAGNA_NETWORK)
+   * @param network         name of the network to use or null to use the default network; only payment platforms with the specified network will be used (env variable equivalent: YAGNA_PAYMENT_NETWORK)
    * @param event_consumer  a callable that processes events related to the computation; by default it is a function that logs all events
    */
   constructor({