Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(clients): fix tari nodejs client proto paths #4743

Merged
merged 3 commits into from
Sep 28, 2022
Merged

fix(clients): fix tari nodejs client proto paths #4743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b3a1f6
fix(clients): fix tari nodejs client proto paths
sdbondi Sep 28, 2022
5fd2365
update package-lock.json
sdbondi Sep 28, 2022
6c6c41d
install deps for clients on circleci
sdbondi Sep 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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