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: merge service crate #506

Merged
merged 3 commits into from
Aug 3, 2023
Merged

fix: merge service crate #506

merged 3 commits into from
Aug 3, 2023

Conversation

nakul1010
Copy link
Member

@nakul1010 nakul1010 commented Jul 27, 2023 •
edited
Loading

Closes #411
The PR adds the following

  • removes service crate
  • merge error types
  • duplicate required dependencies of the service crate in the faucet crate.

@nakul1010 nakul1010 added the InProgress The PR is still in progress label Jul 27, 2023
@nakul1010 nakul1010 self-assigned this Jul 27, 2023
@nakul1010 nakul1010 marked this pull request as draft July 27, 2023 14:09
gregdhill
gregdhill reviewed Jul 28, 2023
View reviewed changes
vault/src/lib.rs Outdated Show resolved Hide resolved
vault/src/error.rs Outdated Show resolved Hide resolved
@nakul1010 nakul1010 force-pushed the nakul/fix_merge_service_crate branch from d0de079 to 4483a93 Compare July 30, 2023 10:13
@nakul1010
Merge branch 'master' of https://github.com/interlay/interbtc-clients …
ae8ece5 
…into nakul/fix_merge_service_crate

# Conflicts:
#	Cargo.lock
@nakul1010 nakul1010 added ReviewNeeded The discussion can be reviewed by peers and removed InProgress The PR is still in progress labels Jul 30, 2023
@nakul1010 nakul1010 marked this pull request as ready for review July 30, 2023 10:16
@nakul1010 nakul1010 requested a review from gregdhill July 30, 2023 10:17
gregdhill
gregdhill reviewed Jul 31, 2023
View reviewed changes
vault/src/lib.rs Outdated Show resolved Hide resolved
vault/src/lib.rs Outdated Show resolved Hide resolved
vault/src/connection_manger.rs Outdated Show resolved Hide resolved
gregdhill
gregdhill reviewed Aug 2, 2023
View reviewed changes
Copy link
Member

@gregdhill gregdhill left a comment

Choose a reason for hiding this comment

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

Looks good, couple minor comments to resolve and then this will be g2g!

vault/src/system.rs Outdated Show resolved Hide resolved
vault/src/system.rs Outdated Show resolved Hide resolved
vault/src/error.rs Show resolved Hide resolved
@nakul1010 nakul1010 force-pushed the nakul/fix_merge_service_crate branch from fd9c26b to 8830613 Compare August 3, 2023 05:45
@gregdhill gregdhill merged commit cc8ed9c into master Aug 3, 2023
6 checks passed
@gregdhill gregdhill deleted the nakul/fix_merge_service_crate branch August 3, 2023 10:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gregdhill gregdhill gregdhill approved these changes

Assignees

@nakul1010 nakul1010

Labels
ReviewNeeded The discussion can be reviewed by peers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Merge service crate into vault
2 participants
@nakul1010 @gregdhill