Skip to content

Commit

Permalink
fix(clients): fix tari nodejs client proto paths (#4743)
Browse files Browse the repository at this point in the history
Description
---
Uses correct path for proto files for nodejs wallet client

Motivation and Context
---
NodeJS clients were put in `nodejs` directory, however the relative path to the proto files were not updated

How Has This Been Tested?
---
Running integration tests
  • Loading branch information
sdbondi authored Sep 28, 2022
1 parent 467cad2 commit 88b75dc
Show file tree
Hide file tree
Showing 6 changed files with 4,056 additions and 168 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ commands:
command: node -v
- run:
name: npm ci
command: cd integration_tests && npm ci
command: cd clients/nodejs/base_node_grpc_client && npm install && cd ../wallet_grpc_client && npm install && cd ../../../integration_tests && npm install
- run:
name: Check formatting
command: cd integration_tests && npm run check-fmt
Expand Down Expand Up @@ -54,7 +54,7 @@ commands:
command: node -v
- run:
name: npm ci
command: cd integration_tests && npm ci
command: cd clients/nodejs/base_node_grpc_client && npm install && cd ../wallet_grpc_client && npm install && cd ../../../integration_tests && npm install
- run:
name: Check eslint
command: cd integration_tests && npm run lint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion clients/nodejs/base_node_grpc_client/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion clients/nodejs/wallet_grpc_client/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion clients/nodejs/wallet_grpc_client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
Loading

0 comments on commit 88b75dc

Please sign in to comment.