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

Bitcoin wallet PRs 2 #4270

Merged
merged 9 commits into from
Dec 19, 2019
Merged

Bitcoin wallet PRs 2 #4270

merged 9 commits into from
Dec 19, 2019

Conversation

jonasschnelli and others added 9 commits December 18, 2019 16:50
Zcash: Modified to move our modifications to "load wallet phase".
Move the two other wallet tests to where they belong.
Removes all the `#ifdef ENABLE_WALLET` from `test_bitcoin` by
making the wallet tests use their own fixture.
Removes conditional dependency of `src/test` on wallet.

Makes multisig and P2SH tests complete without wallet built-in.
Indicate that the file name is not hardcoded, and a little bit of safety
so that it never nukes the main wallet.

Suggestion by Marco Falke.
@str4d str4d added A-wallet Area: Wallet C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase. C-cleanup Category: PRs that clean code up or issues documenting cleanup. labels Dec 18, 2019
@str4d
Copy link
Contributor Author

str4d commented Dec 18, 2019

Only one review is required because this is all moves and refactors of general code. Best reviewed by-commit.

@str4d str4d added this to the v2.1.1 milestone Dec 18, 2019
@str4d
Copy link
Contributor Author

str4d commented Dec 18, 2019

@zkbot r+

@zkbot
Copy link
Contributor

zkbot commented Dec 18, 2019

📌 Commit e42359d has been approved by str4d

@zkbot
Copy link
Contributor

zkbot commented Dec 18, 2019

⌛ Testing commit e42359d with merge fa341bc...

zkbot added a commit that referenced this pull request Dec 18, 2019
@zkbot
Copy link
Contributor

zkbot commented Dec 19, 2019

☀️ Test successful - pr-merge
Approved by: str4d
Pushing fa341bc to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-wallet Area: Wallet C-cleanup Category: PRs that clean code up or issues documenting cleanup. C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants