Skip to content

Commit

Permalink
proper casting
Browse files Browse the repository at this point in the history
  • Loading branch information
@miodragpop
miodragpop committed Apr 26, 2021
1 parent 756e4ef commit 1dfa14a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion vendored-sources/zcash_primitives/.cargo-checksum.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"files":{"CHANGELOG.md":"0a5985cf60e42d8e7d6e8823ed32f68eae0365a189862d944b95ef38d478c09a","Cargo.toml":"5de8232555907f4e672631571e5a6f0a6832c5f497d827564fb0726e08cd8ccb","LICENSE-APACHE":"3708458dee7f359ac6c9c5558023ed481be87e5372c43ebd7f2ca7ad23c12026","LICENSE-MIT":"5746c0bdf1827f3ae16352345242bd67da23fda8e2d7e504264bc1aaea21c678","README.md":"9e7f286a9fa33fd0110fd845b91104f36e6b5436222d1fa6014e4f30307dca74","benches/note_decryption.rs":"3a5a2dcf4a472175563d794453a653eca232716996346f1a1445ee43835e1584","benches/pedersen_hash.rs":"1cab9441f37dc89c44209a39fc0c66020997d5ad064fefc217700a590031c0af","proptest-regressions/transaction/tests.txt":"2937f013450f0aa16c9f4657cf0384f564cc8d0b477d9a974c1a582c245ce439","src/block.rs":"9bf6879d9eb7c30a91d05e247fa766b4af971c830f144d445bc2bfe0acc4c071","src/consensus.rs":"e7bbd3e41fa53347a2021defbb0cb55997d92bc1092e4c952e4b82e3cf335a76","src/constants.rs":"6443d7dcdf82a7b12e541fa702734f2d29772e1f268c08bd3e8bf82183974fa3","src/constants/mainnet.rs":"b94bda5c2223e1886e08eefd5d7f31e0ac991801495d0b866a0edf4eac460a84","src/constants/regtest.rs":"5e455943945d07080080a490cd3c586f9b450b328bd4c4f24002da0a6c724654","src/constants/testnet.rs":"73f6dbd1ce3994ff4c894f34e408b6b3a33bc3f54a888d7f0faea2bd58886951","src/extensions.rs":"a9252224c7dec9e7aba81db139d57429191e238496ed857daa9610cfae49195c","src/extensions/transparent.rs":"93ffe8bb0ba9c2ccf618ebfd7c1cec2adb810275078de34c6d381d61f7254a78","src/group_hash.rs":"aa4e48b1d6601ab1cbb4190bdfa220094cf8fcdd2ae03ad309719a2da52d5358","src/keys.rs":"d761701730bda9312873feb59e5d689c949893ec7791a2e3ccd4c21aac7ea065","src/legacy.rs":"03badf3b232c6973c29ce711ece37d2e108f46c56091f24551563ce51cd754ca","src/lib.rs":"16a88cef2f499e9f9dfafaadaa94d33d11497fc1f53a7feb29b064dfe3d73a04","src/memo.rs":"614a59cc791520b72b4492c54f0400fcd3a474c66908e59df531d6b1d0b75d51","src/merkle_tree.rs":"ecafe3fe4a9722e275853106082e76679a9eca446a14ce7958cb4e38a51a81c2","src/note_encryption.rs":"5aa38738c85b30863d13ad7c80eeb9d71a550fbe4eade346aa9952e675036665","src/pedersen_hash.rs":"81c69713377cbeafa2675e9b5937c518243d241887f78cad76cb3aeff77e2d6d","src/primitives.rs":"deec073ad89b3c86a87978a707d05aa5c4f39931bac9b98edac84dbc95862ca3","src/prover.rs":"1b2b69d651bc2b2f5480bb356060a1bb1f2c2b293e1076dcaf2a1af235c057a2","src/redjubjub.rs":"1547d97bd471c0252fd4bf6c788a21d7fe36dc3cdaf088304f4b189f03c46ce1","src/sapling.rs":"c7e820680be84da805c6ed9c745077e2a291a16ee5d08fa13859a5ef2629fa51","src/serialize.rs":"8805261e96d7076d0bac728d5303fb5321948c60ff448e34c693a4cffe7680b0","src/test_vectors.rs":"a10557a92f42a0cba714181803fb23c23410db28933aca4b5d7425aee511bb47","src/test_vectors/note_encryption.rs":"e19f90fcb3d55cb45096535e17ceb004ad3b8d1278ac71fe9fa5acbbb01d8f70","src/test_vectors/pedersen_hash_vectors.rs":"94184f908646939e1f2a71872ce0700d5e5c9de2cd34d024912825384a0c1308","src/transaction/builder.rs":"99b1883e9f46deb3668b06be6116f335d978bb995abaf5e2f2467bfe3757fab4","src/transaction/components.rs":"c3e8e6d899aba450e6d533b3891ff848d80aee3fc430f5232a8d688d473f0ed1","src/transaction/components/amount.rs":"780f0f9f7741547cf7a74cdce6908ac9a3db410e5fc519779147496dc00bc4a8","src/transaction/mod.rs":"8d0c07ca833aa1a04eaf7fbf208b2ddaa34604fe08c1fd043ca120fc0e73dd51","src/transaction/sighash.rs":"36233d798960069eb7e713ebe4947278a717791e37b6fb590192fccf0b27e84b","src/transaction/tests.rs":"8300c75d41ceb8b126e0841941e4c387b7184e6cabb0452d6208f28241b8f646","src/transaction/tests/data.rs":"ee8309c693844f6fb2e5938f19672505f1ab26b1b11c138871150f9bf65d33f2","src/util.rs":"e6513c6763a5449580485b5b5a4a5cbbaa5b79bd098ebceb2e5fb496729ed49b","src/util/sha256d.rs":"2eae816d0b347fe772d3128ea900ce6fb4030dd6b943bf8ac5943466cd4581d4","src/zip32.rs":"d8136ba4a6d0f8ee3b8efa00e79af2eb358645d474aafb13ecb09e2bcbaf61a4"},"package":"926666fae42e08d65ddba7c3808873d1e6cd6e7dd86e84f51a909c79b5fe285c"}
{"files":{"CHANGELOG.md":"0a5985cf60e42d8e7d6e8823ed32f68eae0365a189862d944b95ef38d478c09a","Cargo.toml":"5de8232555907f4e672631571e5a6f0a6832c5f497d827564fb0726e08cd8ccb","LICENSE-APACHE":"3708458dee7f359ac6c9c5558023ed481be87e5372c43ebd7f2ca7ad23c12026","LICENSE-MIT":"5746c0bdf1827f3ae16352345242bd67da23fda8e2d7e504264bc1aaea21c678","README.md":"9e7f286a9fa33fd0110fd845b91104f36e6b5436222d1fa6014e4f30307dca74","benches/note_decryption.rs":"3a5a2dcf4a472175563d794453a653eca232716996346f1a1445ee43835e1584","benches/pedersen_hash.rs":"1cab9441f37dc89c44209a39fc0c66020997d5ad064fefc217700a590031c0af","proptest-regressions/transaction/tests.txt":"2937f013450f0aa16c9f4657cf0384f564cc8d0b477d9a974c1a582c245ce439","src/block.rs":"9bf6879d9eb7c30a91d05e247fa766b4af971c830f144d445bc2bfe0acc4c071","src/consensus.rs":"3e53832e05e6eb6babf854bfde294968dd451f5c6b566afdf4981b8f8d601820","src/constants.rs":"6443d7dcdf82a7b12e541fa702734f2d29772e1f268c08bd3e8bf82183974fa3","src/constants/mainnet.rs":"b94bda5c2223e1886e08eefd5d7f31e0ac991801495d0b866a0edf4eac460a84","src/constants/regtest.rs":"5e455943945d07080080a490cd3c586f9b450b328bd4c4f24002da0a6c724654","src/constants/testnet.rs":"73f6dbd1ce3994ff4c894f34e408b6b3a33bc3f54a888d7f0faea2bd58886951","src/extensions.rs":"a9252224c7dec9e7aba81db139d57429191e238496ed857daa9610cfae49195c","src/extensions/transparent.rs":"93ffe8bb0ba9c2ccf618ebfd7c1cec2adb810275078de34c6d381d61f7254a78","src/group_hash.rs":"aa4e48b1d6601ab1cbb4190bdfa220094cf8fcdd2ae03ad309719a2da52d5358","src/keys.rs":"d761701730bda9312873feb59e5d689c949893ec7791a2e3ccd4c21aac7ea065","src/legacy.rs":"03badf3b232c6973c29ce711ece37d2e108f46c56091f24551563ce51cd754ca","src/lib.rs":"16a88cef2f499e9f9dfafaadaa94d33d11497fc1f53a7feb29b064dfe3d73a04","src/memo.rs":"614a59cc791520b72b4492c54f0400fcd3a474c66908e59df531d6b1d0b75d51","src/merkle_tree.rs":"ecafe3fe4a9722e275853106082e76679a9eca446a14ce7958cb4e38a51a81c2","src/note_encryption.rs":"5aa38738c85b30863d13ad7c80eeb9d71a550fbe4eade346aa9952e675036665","src/pedersen_hash.rs":"81c69713377cbeafa2675e9b5937c518243d241887f78cad76cb3aeff77e2d6d","src/primitives.rs":"deec073ad89b3c86a87978a707d05aa5c4f39931bac9b98edac84dbc95862ca3","src/prover.rs":"1b2b69d651bc2b2f5480bb356060a1bb1f2c2b293e1076dcaf2a1af235c057a2","src/redjubjub.rs":"1547d97bd471c0252fd4bf6c788a21d7fe36dc3cdaf088304f4b189f03c46ce1","src/sapling.rs":"c7e820680be84da805c6ed9c745077e2a291a16ee5d08fa13859a5ef2629fa51","src/serialize.rs":"8805261e96d7076d0bac728d5303fb5321948c60ff448e34c693a4cffe7680b0","src/test_vectors.rs":"a10557a92f42a0cba714181803fb23c23410db28933aca4b5d7425aee511bb47","src/test_vectors/note_encryption.rs":"e19f90fcb3d55cb45096535e17ceb004ad3b8d1278ac71fe9fa5acbbb01d8f70","src/test_vectors/pedersen_hash_vectors.rs":"94184f908646939e1f2a71872ce0700d5e5c9de2cd34d024912825384a0c1308","src/transaction/builder.rs":"99b1883e9f46deb3668b06be6116f335d978bb995abaf5e2f2467bfe3757fab4","src/transaction/components.rs":"c3e8e6d899aba450e6d533b3891ff848d80aee3fc430f5232a8d688d473f0ed1","src/transaction/components/amount.rs":"780f0f9f7741547cf7a74cdce6908ac9a3db410e5fc519779147496dc00bc4a8","src/transaction/mod.rs":"8d0c07ca833aa1a04eaf7fbf208b2ddaa34604fe08c1fd043ca120fc0e73dd51","src/transaction/sighash.rs":"36233d798960069eb7e713ebe4947278a717791e37b6fb590192fccf0b27e84b","src/transaction/tests.rs":"8300c75d41ceb8b126e0841941e4c387b7184e6cabb0452d6208f28241b8f646","src/transaction/tests/data.rs":"ee8309c693844f6fb2e5938f19672505f1ab26b1b11c138871150f9bf65d33f2","src/util.rs":"e6513c6763a5449580485b5b5a4a5cbbaa5b79bd098ebceb2e5fb496729ed49b","src/util/sha256d.rs":"2eae816d0b347fe772d3128ea900ce6fb4030dd6b943bf8ac5943466cd4581d4","src/zip32.rs":"d8136ba4a6d0f8ee3b8efa00e79af2eb358645d474aafb13ecb09e2bcbaf61a4"},"package":"926666fae42e08d65ddba7c3808873d1e6cd6e7dd86e84f51a909c79b5fe285c"}
10 changes: 5 additions & 5 deletions vendored-sources/zcash_primitives/src/consensus.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ pub const MAIN_NETWORK: MainNetwork = MainNetwork;
impl Parameters for MainNetwork {
fn activation_height(&self, nu: NetworkUpgrade) -> Option<BlockHeight> {
match nu {
NetworkUpgrade::Overwinter => Some(484_000),
NetworkUpgrade::Sapling => Some(484_000),
NetworkUpgrade::Bzshares => Some(883_000),
NetworkUpgrade::Overwinter => Some(BlockHeight(484_000)),
NetworkUpgrade::Sapling => Some(BlockHeight(484_000)),
NetworkUpgrade::Bzshares => Some(BlockHeight(883_000)),
NetworkUpgrade::Blossom => None,
NetworkUpgrade::Heartwood => None,
NetworkUpgrade::Canopy => None,
Expand Down Expand Up @@ -235,8 +235,8 @@ pub const TEST_NETWORK: TestNetwork = TestNetwork;
impl Parameters for TestNetwork {
fn activation_height(&self, nu: NetworkUpgrade) -> Option<BlockHeight> {
match nu {
NetworkUpgrade::Overwinter => Some(207_500),
NetworkUpgrade::Sapling => Some(280_000),
NetworkUpgrade::Overwinter => Some(BlockHeight(207_500)),
NetworkUpgrade::Sapling => Some(BlockHeight(280_000)),
NetworkUpgrade::Bzshares => None,
NetworkUpgrade::Blossom => None,
NetworkUpgrade::Heartwood => None,
Expand Down

0 comments on commit 1dfa14a

Please sign in to comment.