mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-12 10:01:17 +00:00
Move cryptographic hashing procedures to crypto folder. (#2306)
Step towards https://github.com/paritytech/polkadot-sdk/issues/1975 As reported https://github.com/paritytech/polkadot-sdk/issues/1975#issuecomment-1774534225 I'd like to encapsulate crypto related stuff in a dedicated folder. Currently all cryptographic primitive wrappers are all sparsed in `substrate/core` which contains "misc core" stuff. To simplify the process, as the first step with this PR I propose to move the cryptographic hashing there. The `substrate/crypto` folder was already created to contains `ec-utils` crate. Notes: - rename `sp-core-hashing` to `sp-crypto-hashing` - rename `sp-core-hashing-proc-macro` to `sp-crypto-hashing-proc-macro` - As the crates name is changed I took the freedom to restart fresh from version 0.1.0 for both crates --------- Co-authored-by: Robert Hambrock <roberthambrock@gmail.com>
This commit is contained in:
@@ -27,6 +27,7 @@ sp-inherents = { path = "../../primitives/inherents", default-features = false }
|
||||
sp-keyring = { path = "../../primitives/keyring", optional = true }
|
||||
sp-offchain = { path = "../../primitives/offchain", default-features = false }
|
||||
sp-core = { path = "../../primitives/core", default-features = false }
|
||||
sp-crypto-hashing = { path = "../../primitives/crypto/hashing", default-features = false }
|
||||
sp-std = { path = "../../primitives/std", default-features = false }
|
||||
sp-io = { path = "../../primitives/io", default-features = false }
|
||||
frame-support = { path = "../../frame/support", default-features = false }
|
||||
@@ -93,6 +94,7 @@ std = [
|
||||
"sp-consensus-babe/std",
|
||||
"sp-consensus-grandpa/std",
|
||||
"sp-core/std",
|
||||
"sp-crypto-hashing/std",
|
||||
"sp-externalities/std",
|
||||
"sp-genesis-builder/std",
|
||||
"sp-inherents/std",
|
||||
|
||||
@@ -845,11 +845,11 @@ pub mod storage_key_generator {
|
||||
}
|
||||
|
||||
fn concat_hashes(input: &Vec<&[u8]>) -> String {
|
||||
input.iter().map(|s| sp_core::hashing::twox_128(s)).map(hex).collect()
|
||||
input.iter().map(|s| sp_crypto_hashing::twox_128(s)).map(hex).collect()
|
||||
}
|
||||
|
||||
fn twox_64_concat(x: &[u8]) -> Vec<u8> {
|
||||
sp_core::hashing::twox_64(x).iter().chain(x.iter()).cloned().collect::<Vec<_>>()
|
||||
sp_crypto_hashing::twox_64(x).iter().chain(x.iter()).cloned().collect()
|
||||
}
|
||||
|
||||
/// Generate the hashed storage keys from the raw literals. These keys are expected to be be in
|
||||
@@ -890,7 +890,7 @@ pub mod storage_key_generator {
|
||||
AccountKeyring::Charlie.public().to_vec(),
|
||||
])
|
||||
.map(|pubkey| {
|
||||
sp_core::hashing::blake2_128(&pubkey)
|
||||
sp_crypto_hashing::blake2_128(&pubkey)
|
||||
.iter()
|
||||
.chain(pubkey.iter())
|
||||
.cloned()
|
||||
|
||||
Reference in New Issue
Block a user