fix(clients): fix tari nodejs client proto paths

tari-project · Sep 28, 2022 · 5f8e8dc · 5f8e8dc
1 parent 467cad2
commit 5f8e8dc
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -120,7 +120,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: lts/erbium
           cache: 'npm'
           cache-dependency-path: integration_tests/package-lock.json
 
@@ -133,7 +133,7 @@ jobs:
           npm run check-fmt
           npm run lint
           npm ci
-          cd ../clients/base_node_grpc_client
+          cd ../clients/nodejs/base_node_grpc_client
           npm install
           cd ../wallet_grpc_client
           npm install

diff --git a/clients/nodejs/base_node_grpc_client/src/index.js b/clients/nodejs/base_node_grpc_client/src/index.js
@@ -9,7 +9,7 @@ const path = require("path");
 const packageDefinition = protoLoader.loadSync(
   path.resolve(
     __dirname,
-    "../../../applications/tari_app_grpc/proto/base_node.proto"
+    "../../../../applications/tari_app_grpc/proto/base_node.proto"
   ),
   {
     keepCase: true,

diff --git a/clients/nodejs/wallet_grpc_client/index.js b/clients/nodejs/wallet_grpc_client/index.js
@@ -6,7 +6,7 @@ const protoLoader = require("@grpc/proto-loader");
 const { promisifyAll } = require("grpc-promise");
 
 const packageDefinition = protoLoader.loadSync(
-  `${__dirname}/../../applications/tari_app_grpc/proto/wallet.proto`,
+  `${__dirname}/../../../applications/tari_app_grpc/proto/wallet.proto`,
   {
     keepCase: true,
     longs: String,

diff --git a/clients/nodejs/wallet_grpc_client/package.json b/clients/nodejs/wallet_grpc_client/package.json
@@ -8,7 +8,7 @@
   },
   "author": "Tari development community",
   "dependencies": {
-    "@grpc/grpc-js": "^1.3.6",
+    "@grpc/grpc-js": "^1.7.0",
     "@grpc/proto-loader": "^0.5.5",
     "grpc-promise": "^1.4.0"
   }

diff --git a/integration_tests/helpers/walletClient.js b/integration_tests/helpers/walletClient.js
@@ -1,7 +1,7 @@
 // Copyright 2022 The Tari Project
 // SPDX-License-Identifier: BSD-3-Clause
 
-const { Client } = require("wallet-grpc-client");
+const { Client } = require("@tari/wallet-grpc-client");
 const {
   byteArrayToHex,
   tryConnect,

diff --git a/integration_tests/package.json b/integration_tests/package.json
@@ -44,7 +44,7 @@
     "sha3": "^2.1.3",
     "tari_crypto": "v0.14.0",
     "utf8": "^3.0.0",
-    "wallet-grpc-client": "file:../clients/nodejs/wallet_grpc_client",
+    "@tari/wallet-grpc-client": "file:../clients/nodejs/wallet_grpc_client",
     "varint": "^6.0.0"
   }
 }