Lift dependencies up to top of file, remove redundant secp/zkp libraries #234
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lifted dependencies in minimint and gateway, standardized to bitcoin::secp256k1::{XOnlyPublicKey, PublicKey} except where we touch miniscript
finished lifting dependencies, removed zkp from 2 modules
maan2003
approved these changes
Jul 10, 2022
| @@ -8,14 +8,13 @@ edition = "2018" | |||
| [dependencies] | |||
| anyhow = "1.0.58" | |||
| async-trait = "0.1" | |||
| bitcoin = { version = "0.28.1", features = [ "rand", "serde" ] } | |||
| bitcoin = { version = "0.28.1", features = [ "rand", "serde", "use-serde"] } | |||
There was a problem hiding this comment.
you can remove "serde" because use-serde enables that
There was a problem hiding this comment.
FYI use-serde is being renamed to serde in the next release rust-bitcoin/rust-bitcoin#1006
|
LGTM. This makes code more readable IMO. |
|
I apologize for sending you to rebase hell, Kody :( |
|
@justinmoon it's a learning exercise haha |
|
Going to close this since the rebase will be impossible. Feel free to re-open. Will try to get faster review next time. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Went through and cleaned up some of our dependency usage, lifting as much as I could up into the use statements. In the process I standardized to using the keys in bitcoin::secp256k1::{PublicKey, XOnlyPublicKey}, if we use bitcoin::PublicKey for example then we have to import the bitcoin crate wherever we want to use it instead of just pulling in secp. The only crate that strictly requires using bitcoin::PublicKey right now is miniscript so in the wallet we can convert from the secp -> bitcoin::PublicKey using kp.to_public_key()
Also was able to remove secp256k1-zkp from client-lib, minimint-api, and minimint Cargo.tomls. All the functions and structs they were using have been integrated into secp256k1. I also removed secp256k1 as a dependency where we already were using the bitcoin crate.