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.

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

zcash_client_sqlite: Fix bad WalletTest import that breaks downstream builds. #1542

Merged
merged 2 commits into from
Sep 20, 2024

Conversation

nuttycom
Copy link
Contributor

@nuttycom nuttycom commented Sep 20, 2024

No description provided.

@nuttycom nuttycom changed the title zcash_client_sqlite: Fix bad WalletTest import that breaks downstre… zcash_client_sqlite: Fix bad WalletTest import that breaks downstream builds. Sep 20, 2024
daira
daira previously approved these changes Sep 20, 2024
Copy link
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

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

utACK

Copy link
Contributor

@str4d str4d left a comment

Choose a reason for hiding this comment

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

NACK, this will conflict with #1543, where I (believe I) also fixed this.

Copy link

codecov bot commented Sep 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 60.51%. Comparing base (8b5236a) to head (176c0cb).
Report is 3 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1542   +/-   ##
=======================================
  Coverage   60.51%   60.51%           
=======================================
  Files         147      147           
  Lines       17313    17313           
=======================================
  Hits        10477    10477           
  Misses       6836     6836           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@nuttycom
Copy link
Contributor Author

@str4d since the changed lines are identical, it shouldn't conflict. But I'm reviewing #1543 now.

Copy link
Contributor

@str4d str4d left a comment

Choose a reason for hiding this comment

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

ACK 176c0cb. I think this should not conflict with #1543 as they do happen to be identical on the relevant lines, and this PR was an undeclared dependency of https://github.com/Electric-Coin-Company/zec-sqlite-cli/pull/46 so we need this commit to end up in main.

@str4d str4d merged commit c0f4eff into main Sep 20, 2024
28 checks passed
@str4d str4d deleted the fix_bad_wallettest_import branch September 20, 2024 23:12
Copy link
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

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

Post-hoc ACK 176c0cb

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants