mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-14 22:41:06 +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:
@@ -24,7 +24,7 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
|
||||
|
||||
sp-std = { path = "../../primitives/std", default-features = false }
|
||||
sp-core = { path = "../../primitives/core", default-features = false }
|
||||
sp-core-hashing = { path = "../../primitives/core/hashing", default-features = false, optional = true }
|
||||
sp-crypto-hashing = { path = "../../primitives/crypto/hashing", default-features = false, optional = true }
|
||||
sp-io = { path = "../../primitives/io", default-features = false }
|
||||
sp-runtime = { path = "../../primitives/runtime", default-features = false }
|
||||
|
||||
@@ -37,7 +37,7 @@ pallet-collective = { path = "../collective", default-features = false, optional
|
||||
|
||||
[dev-dependencies]
|
||||
array-bytes = "6.1"
|
||||
sp-core-hashing = { path = "../../primitives/core/hashing", default-features = false }
|
||||
sp-crypto-hashing = { path = "../../primitives/crypto/hashing", default-features = false }
|
||||
pallet-balances = { path = "../balances" }
|
||||
pallet-collective = { path = "../collective" }
|
||||
|
||||
@@ -53,8 +53,8 @@ std = [
|
||||
"pallet-collective?/std",
|
||||
"pallet-identity/std",
|
||||
"scale-info/std",
|
||||
"sp-core-hashing?/std",
|
||||
"sp-core/std",
|
||||
"sp-crypto-hashing?/std",
|
||||
"sp-io/std",
|
||||
"sp-runtime/std",
|
||||
"sp-std/std",
|
||||
@@ -67,7 +67,7 @@ runtime-benchmarks = [
|
||||
"pallet-balances/runtime-benchmarks",
|
||||
"pallet-collective/runtime-benchmarks",
|
||||
"pallet-identity/runtime-benchmarks",
|
||||
"sp-core-hashing",
|
||||
"sp-crypto-hashing",
|
||||
"sp-runtime/runtime-benchmarks",
|
||||
]
|
||||
try-runtime = [
|
||||
|
||||
@@ -42,7 +42,7 @@ fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::
|
||||
}
|
||||
|
||||
fn cid(input: impl AsRef<[u8]>) -> Cid {
|
||||
let result = sp_core_hashing::sha2_256(input.as_ref());
|
||||
let result = sp_crypto_hashing::sha2_256(input.as_ref());
|
||||
Cid::new_v0(result)
|
||||
}
|
||||
|
||||
|
||||
@@ -388,7 +388,7 @@ pub fn new_bench_ext() -> sp_io::TestExternalities {
|
||||
}
|
||||
|
||||
pub fn test_cid() -> Cid {
|
||||
let result = sp_core_hashing::sha2_256(b"hello world");
|
||||
let result = sp_crypto_hashing::sha2_256(b"hello world");
|
||||
Cid::new_v0(result)
|
||||
}
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@ frame-support = { path = "../support", default-features = false }
|
||||
frame-system = { path = "../system", default-features = false }
|
||||
|
||||
[dev-dependencies]
|
||||
sp-crypto-hashing = { path = "../../primitives/crypto/hashing" }
|
||||
sp-tracing = { path = "../../primitives/tracing" }
|
||||
rand = "0.8.5"
|
||||
rand_distr = "0.4.3"
|
||||
|
||||
@@ -23,7 +23,7 @@ use crate::{mock::*, *};
|
||||
|
||||
use frame_support::{assert_noop, assert_ok, assert_storage_noop, StorageNoopGuard};
|
||||
use rand::{rngs::StdRng, Rng, SeedableRng};
|
||||
use sp_core::blake2_256;
|
||||
use sp_crypto_hashing::blake2_256;
|
||||
|
||||
#[test]
|
||||
fn mocked_weight_works() {
|
||||
|
||||
@@ -31,6 +31,7 @@ sp-std = { path = "../../primitives/std", default-features = false }
|
||||
[dev-dependencies]
|
||||
array-bytes = "6.1"
|
||||
sp-core = { path = "../../primitives/core" }
|
||||
sp-crypto-hashing = { path = "../../primitives/crypto/hashing" }
|
||||
|
||||
[features]
|
||||
default = ["std"]
|
||||
|
||||
@@ -209,7 +209,7 @@ pub fn make_ticket_body(attempt_idx: u32, pair: &AuthorityPair) -> (TicketId, Ti
|
||||
}
|
||||
|
||||
pub fn make_dummy_ticket_body(attempt_idx: u32) -> (TicketId, TicketBody) {
|
||||
let hash = sp_core::hashing::blake2_256(&attempt_idx.to_le_bytes());
|
||||
let hash = sp_crypto_hashing::blake2_256(&attempt_idx.to_le_bytes());
|
||||
|
||||
let erased_public = EphemeralPublic::unchecked_from(hash);
|
||||
let revealed_public = erased_public;
|
||||
|
||||
@@ -33,6 +33,7 @@ frame-system = { path = "../system", default-features = false }
|
||||
frame-support-test = { path = "../support/test" }
|
||||
pallet-balances = { path = "../balances" }
|
||||
sp-core = { path = "../../primitives/core" }
|
||||
sp-crypto-hashing = { path = "../../primitives/crypto/hashing" }
|
||||
sp-io = { path = "../../primitives/io" }
|
||||
|
||||
[features]
|
||||
|
||||
@@ -22,7 +22,7 @@ use migrations::old;
|
||||
use mock::*;
|
||||
|
||||
use frame_support::{assert_noop, assert_ok};
|
||||
use sp_core::blake2_256;
|
||||
use sp_crypto_hashing::blake2_256;
|
||||
use sp_runtime::traits::BadOrigin;
|
||||
use BidKind::*;
|
||||
use VouchingStatus::*;
|
||||
|
||||
@@ -42,7 +42,7 @@ bitflags = "1.3"
|
||||
impl-trait-for-tuples = "0.2.2"
|
||||
smallvec = "1.11.0"
|
||||
log = { version = "0.4.17", default-features = false }
|
||||
sp-core-hashing-proc-macro = { path = "../../primitives/core/hashing/proc-macro" }
|
||||
sp-crypto-hashing-proc-macro = { path = "../../primitives/crypto/hashing/proc-macro" }
|
||||
k256 = { version = "0.13.1", default-features = false, features = ["ecdsa"] }
|
||||
environmental = { version = "1.1.4", default-features = false }
|
||||
sp-genesis-builder = { path = "../../primitives/genesis-builder", default-features = false }
|
||||
@@ -56,6 +56,7 @@ aquamarine = { version = "0.5.0" }
|
||||
assert_matches = "1.3.0"
|
||||
pretty_assertions = "1.2.1"
|
||||
frame-system = { path = "../system" }
|
||||
sp-crypto-hashing = { path = "../../primitives/crypto/hashing" }
|
||||
|
||||
[features]
|
||||
default = ["std"]
|
||||
|
||||
@@ -29,14 +29,14 @@ frame-support-procedural-tools = { path = "tools" }
|
||||
macro_magic = { version = "0.5.0", features = ["proc_support"] }
|
||||
proc-macro-warning = { version = "1.0.0", default-features = false }
|
||||
expander = "2.0.0"
|
||||
sp-core-hashing = { path = "../../../primitives/core/hashing", default-features = false }
|
||||
sp-crypto-hashing = { path = "../../../primitives/crypto/hashing", default-features = false }
|
||||
|
||||
[dev-dependencies]
|
||||
regex = "1"
|
||||
|
||||
[features]
|
||||
default = ["std"]
|
||||
std = ["sp-core-hashing/std"]
|
||||
std = ["sp-crypto-hashing/std"]
|
||||
no-metadata-docs = []
|
||||
# Generate impl-trait for tuples with the given number of tuples. Will be needed as the number of
|
||||
# pallets in a runtime grows. Does increase the compile time!
|
||||
|
||||
@@ -613,7 +613,7 @@ pub fn check_pallet_call_return_type(type_: &syn::Type) -> syn::Result<()> {
|
||||
}
|
||||
|
||||
pub(crate) fn two128_str(s: &str) -> TokenStream {
|
||||
bytes_to_array(sp_core_hashing::twox_128(s.as_bytes()).into_iter())
|
||||
bytes_to_array(sp_crypto_hashing::twox_128(s.as_bytes()).into_iter())
|
||||
}
|
||||
|
||||
pub(crate) fn bytes_to_array(bytes: impl IntoIterator<Item = u8>) -> TokenStream {
|
||||
|
||||
@@ -45,7 +45,7 @@ pub mod __private {
|
||||
pub use scale_info;
|
||||
pub use serde;
|
||||
pub use sp_core::{OpaqueMetadata, Void};
|
||||
pub use sp_core_hashing_proc_macro;
|
||||
pub use sp_crypto_hashing_proc_macro;
|
||||
pub use sp_inherents;
|
||||
#[cfg(feature = "std")]
|
||||
pub use sp_io::TestExternalities;
|
||||
@@ -330,7 +330,7 @@ macro_rules! parameter_types {
|
||||
impl< $($ty_params),* > $name< $($ty_params),* > {
|
||||
/// Returns the key for this parameter type.
|
||||
pub fn key() -> [u8; 16] {
|
||||
$crate::__private::sp_core_hashing_proc_macro::twox_128!(b":", $name, b":")
|
||||
$crate::__private::sp_crypto_hashing_proc_macro::twox_128!(b":", $name, b":")
|
||||
}
|
||||
|
||||
/// Set the value of this parameter type in the storage.
|
||||
|
||||
@@ -1712,7 +1712,7 @@ mod test {
|
||||
use bounded_vec::BoundedVec;
|
||||
use frame_support::traits::ConstU32;
|
||||
use generator::StorageValue as _;
|
||||
use sp_core::hashing::twox_128;
|
||||
use sp_crypto_hashing::twox_128;
|
||||
use sp_io::TestExternalities;
|
||||
use weak_bounded_vec::WeakBoundedVec;
|
||||
|
||||
|
||||
@@ -302,7 +302,7 @@ pub trait GetStorageVersion {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use sp_core::twox_128;
|
||||
use sp_crypto_hashing::twox_128;
|
||||
|
||||
struct Pallet1;
|
||||
impl PalletInfoAccess for Pallet1 {
|
||||
|
||||
Reference in New Issue
Block a user