This repository has been archived by the owner on Nov 9, 2023. It is now read-only.
Update dusk-plonk and canonical and related dependencies #130
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
- Update `dusk-pki` from `v0.6` to `v0.7.0-rc.0`. - Update `dusk-poseidon` from `v0.20.0` to `v0.21.0-rc.0`. - Update `dusk-bls12_381` from `v0.6.0` to `v0.8.0-rc.0`. - Update `dusk-jubjub` from `v0.8.0` to `v0.10.0-rc.0`. - Update `dusk-plonk` from `v0.5` to `v0.8.0-rc.1`. - Update `rand-core` from `v0.5` to `v0.6`. - Update `canonical` from `v0.5` to `v0.6`. - Update `rand` from `v0.7` to `v0.8`. - Update `plonk_gadgets` from `v0.5` to `v0.6.0-rc.0`. - Remove `MemStore` references from tests. - Remove `canonical-host` from dev-deps. - Update tests according to the new `dusk-plonk` API. - Change `Bid::pos` method to return &u64 instead of `u64` directly. Resolves: #127 Resolves: #129
ZER0
suggested changes
May 3, 2021
Cargo.toml
Outdated
| anyhow = {version = "1", optional = true} | ||
| dusk-bytes = "0.1" | ||
| cfg-if = "1.0" | ||
|
|
||
| [dev-dependencies] | ||
| canonical_host = "0.5" | ||
| microkelvin = "0.7.1" |
There was a problem hiding this comment.
Always use the form major.minor never use the fix:
Suggested change
| microkelvin = "0.7.1" | |
| microkelvin = "0.7" |
| @@ -154,12 +145,11 @@ mod protocol_tests { | |||
| let latest_consensus_step = 50u64; | |||
|
|
|||
| // Append the Bid to the tree. | |||
| tree.push(bid.into()); | |||
| tree.push(bid.into()).unwrap(); | |||
There was a problem hiding this comment.
Use expect at least, or since the test returns a Result checks if you can use ? or map_err.
| .poseidon_branch(0usize) | ||
| .expect("Poseidon Branch Extraction"); | ||
| let branch = | ||
| tree.branch(0).expect("Poseidon Branch Extraction").unwrap(); |
| @@ -237,12 +231,11 @@ mod protocol_tests { | |||
| let latest_consensus_step = 25519u64; | |||
|
|
|||
| // Append the Bid to the tree. | |||
| tree.push(bid.into()); | |||
| tree.push(bid.into()).unwrap(); | |||
There was a problem hiding this comment.
Same here.
To be clear, if the tests was already using unwrap() I wouldn't care much, but this is a kind of "regression".
| .poseidon_branch(0usize) | ||
| .expect("Poseidon Branch Extraction"); | ||
| let branch = | ||
| tree.branch(0).expect("Poseidon Branch Extraction").unwrap(); |
| @@ -331,12 +328,11 @@ mod protocol_tests { | |||
| .expect("Bid creation error"); | |||
|
|
|||
| // Append the Bid to the tree. | |||
| tree.push(bid.into()); | |||
| tree.push(bid.into()).unwrap(); | |||
| .poseidon_branch(0usize) | ||
| .expect("Poseidon Branch Extraction"); | ||
| let branch = | ||
| tree.branch(0).expect("Poseidon Branch Extraction").unwrap(); |
| @@ -433,12 +433,11 @@ mod protocol_tests { | |||
| .expect("Bid creation error"); | |||
|
|
|||
| // Append the Bid to the tree. | |||
| tree.push(bid.into()); | |||
| tree.push(bid.into()).unwrap(); | |||
| .poseidon_branch(0usize) | ||
| .expect("Poseidon Branch Extraction"); | ||
| let branch = | ||
| tree.branch(0).expect("Poseidon Branch Extraction").unwrap(); |
| fn poseidon_hash(&self) -> BlsScalar { | ||
| self.0.hash() | ||
| } | ||
|
|
||
| fn pos(&self) -> u64 { | ||
| self.0.pos() | ||
| *self.0.pos() |
There was a problem hiding this comment.
We already discuss that, and I've mixed feeling about it.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
dusk-pkifromv0.6tov0.7.0-rc.0.dusk-poseidonfromv0.20.0tov0.21.0-rc.0.dusk-bls12_381fromv0.6.0tov0.8.0-rc.0.dusk-jubjubfromv0.8.0tov0.10.0-rc.0.dusk-plonkfromv0.5tov0.8.0-rc.1.rand-corefromv0.5tov0.6.canonicalfromv0.5tov0.6.randfromv0.7tov0.8.plonk_gadgetsfromv0.5tov0.6.0-rc.0.MemStorereferences from tests.canonical-hostfrom dev-deps.dusk-plonkAPI.Bid::posmethod to return &u64 instead ofu64directly.Resolves: #127, #129