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(client): Fix torii url with path #4903

Merged
merged 2 commits into from
Jul 29, 2024
Merged

fix(client): Fix torii url with path #4903

merged 2 commits into from
Jul 29, 2024

Conversation

dima74
Copy link
Contributor

@dima74 dima74 commented Jul 26, 2024

Description

Consider client.toml:

torii_url = "http://iroha-test.com/peer-1/"

Currently /peer-1/ part will be ignored and queries will be send to http://iroha-test.com/query. This PR fixes it

Benefits

Fix using torii_url with path in client.toml

Checklist

  • I've read CONTRIBUTING.md
  • I've used the standard signed-off commit format (or will squash just before merging)
  • All applicable CI checks pass (or I promised to make them pass later)
  • (optional) I've written unit tests for the code changes
  • I replied to all comments after code review, marking all implemented changes with thumbs up

@dima74 dima74 self-assigned this Jul 26, 2024
0x009922
0x009922 previously approved these changes Jul 29, 2024
View reviewed changes
Copy link
Contributor

@0x009922 0x009922 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be also nice to add simple unit tests covering join_torii_url and user config transformations.

@0x009922 0x009922 self-assigned this Jul 29, 2024
nxsaken
nxsaken previously approved these changes Jul 29, 2024
View reviewed changes
DCNick3
DCNick3 previously approved these changes Jul 29, 2024
View reviewed changes
client/src/client.rs Show resolved Hide resolved
dima74 added 2 commits July 29, 2024 13:53
@dima74
fix(client): Fix torii url with path
ae2942a 
Signed-off-by: Dmitry Murzin <[email protected]>
@dima74
Add tests
e2ba1fd 
Signed-off-by: Dmitry Murzin <[email protected]>
@dima74 dima74 dismissed stale reviews from DCNick3, nxsaken, and 0x009922 via e2ba1fd July 29, 2024 11:18
@dima74 dima74 force-pushed the diralik/fix-torii-url branch from 93eb2b7 to e2ba1fd Compare July 29, 2024 11:18
@github-actions github-actions bot added the config-changes Changes in configuration and start up of the Iroha label Jul 29, 2024
@github-actions GitHub Actions
Copy link

@BAStos525

@dima74 dima74 merged commit f764b13 into hyperledger-iroha:main Jul 29, 2024
11 of 12 checks passed
@dima74 dima74 deleted the diralik/fix-torii-url branch July 29, 2024 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nxsaken nxsaken nxsaken approved these changes

@DCNick3 DCNick3 DCNick3 approved these changes

@0x009922 0x009922 0x009922 left review comments

@s8sato s8sato Awaiting requested review from s8sato s8sato is a code owner

@mversic mversic Awaiting requested review from mversic mversic is a code owner

@SamHSmith SamHSmith Awaiting requested review from SamHSmith

@outoftardis outoftardis Awaiting requested review from outoftardis outoftardis is a code owner

@Erigara Erigara Awaiting requested review from Erigara

Assignees

@dima74 dima74

@DCNick3 DCNick3

@nxsaken nxsaken

@0x009922 0x009922

Labels
config-changes Changes in configuration and start up of the Iroha
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dima74 @DCNick3 @nxsaken @0x009922