diff --git a/pallets/entries/src/tests.rs b/pallets/entries/src/tests.rs index 8188693e3..f37535519 100644 --- a/pallets/entries/src/tests.rs +++ b/pallets/entries/src/tests.rs @@ -95,7 +95,6 @@ fn create_registry_entry_should_work() { /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -206,7 +205,6 @@ fn update_registry_entry_should_work() { /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -358,7 +356,6 @@ fn revoke_registry_entry_should_work() { /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -471,7 +468,6 @@ fn reinstating_revoked_registry_entry_should_work() { /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -605,7 +601,6 @@ fn update_registry_entry_should_work_for_valid_creator() { /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(admin.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -766,7 +761,6 @@ fn update_registry_entry_should_work_for_valid_admin() { /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -935,7 +929,6 @@ fn update_registry_entry_should_fail_for_non_registry_entry_creator() { /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(admin.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -1117,7 +1110,6 @@ fn update_registry_entry_should_fail_for_non_registry_admin() { /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(admin.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id.clone()), Some(blob.clone()), @@ -1133,7 +1125,6 @@ fn update_registry_entry_should_fail_for_non_registry_admin() { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(invalid_admin.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -1289,7 +1280,6 @@ fn update_ownership_of_registry_entry_creator_should_work_for_creator() { /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(admin.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -1452,7 +1442,6 @@ fn update_ownership_of_registry_entry_creator_should_work_for_admin() { /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(admin.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -1615,7 +1604,6 @@ fn new_owner_should_be_able_to_perform_registry_entry_operations_after_ownership /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(admin.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -1830,7 +1818,6 @@ fn old_owner_should_not_be_able_to_perform_registry_entry_operations_after_owner /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(admin.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -2033,7 +2020,6 @@ fn update_ownership_should_fail_for_updating_themselves() { /* Test creation of a Registry */ assert_ok!(Registries::create( frame_system::RawOrigin::Signed(admin.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), diff --git a/pallets/registries/src/benchmarking.rs b/pallets/registries/src/benchmarking.rs index c2aa88fbd..1813381c8 100644 --- a/pallets/registries/src/benchmarking.rs +++ b/pallets/registries/src/benchmarking.rs @@ -74,7 +74,6 @@ benchmarks! { Pallet::::create( RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id.clone()), Some(blob), @@ -135,7 +134,6 @@ benchmarks! { Pallet::::create( RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id.clone()), Some(blob), @@ -194,7 +192,6 @@ benchmarks! { Pallet::::create( RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id.clone()), Some(blob), @@ -255,7 +252,6 @@ benchmarks! { Pallet::::create( RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id.clone()), Some(blob), @@ -315,7 +311,6 @@ benchmarks! { }: _( RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id.clone()), Some(blob) @@ -369,7 +364,6 @@ benchmarks! { Pallet::::create( RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id.clone()), Some(blob), @@ -424,7 +418,6 @@ benchmarks! { Pallet::::create( RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id.clone()), Some(blob), @@ -476,7 +469,6 @@ benchmarks! { Pallet::::create( RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id.clone()), Some(blob), @@ -534,7 +526,6 @@ benchmarks! { Pallet::::create( RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id.clone()), Some(blob), @@ -586,7 +577,6 @@ benchmarks! { Pallet::::create( RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id.clone()), Some(blob), diff --git a/pallets/registries/src/lib.rs b/pallets/registries/src/lib.rs index a17134052..a87a94898 100644 --- a/pallets/registries/src/lib.rs +++ b/pallets/registries/src/lib.rs @@ -514,7 +514,6 @@ pub mod pallet { /// /// # Parameters /// - `origin`: The origin of the transaction, signed by the creator. - /// - `registry_id`: A unique code created to identify the registry. /// - `digest`: The digest representing the registry data to be created. /// - `schema_id`: (Optional) A unique code represnting the Schema. /// - `blob`: (Optional) Metadata or data associated with the registry. @@ -540,28 +539,18 @@ pub mod pallet { #[pallet::weight({0})] pub fn create( origin: OriginFor, - _registry_id: RegistryIdOf, digest: RegistryHashOf, schema_id: Option, _blob: Option>, ) -> DispatchResult { let creator = ensure_signed(origin)?; - // TODO: Create the identifier at SDK level & validate at chain level. // Id Digest = concat (H(, // )) let id_digest = ::Hashing::hash( &[&digest.encode()[..], &creator.encode()[..]].concat()[..], ); - // /* Ensure that registry_id is of valid ss58 format, - // * and also the type matches to be of `Registries`. - // */ - // ensure!( - // Self::is_valid_ss58_format(®istry_id), - // Error::::InvalidRegistryIdentifier - // ); - let identifier = Ss58Identifier::create_identifier( &id_digest.encode()[..], IdentifierType::Registries, @@ -1284,23 +1273,4 @@ impl Pallet { index: frame_system::Pallet::::extrinsic_index().unwrap_or_default(), } } - - /// Method to check if the input identifier calculated from sdk - /// is actually a valid SS58 Identifier Format and of valid type `Registries`. - pub fn is_valid_ss58_format(identifier: &Ss58Identifier) -> bool { - match identifier.get_type() { - Ok(id_type) => - if id_type == IdentifierType::Registries { - log::debug!("The SS58 identifier is of type Registries."); - true - } else { - log::debug!("The SS58 identifier is not of type Registries."); - false - }, - Err(e) => { - log::debug!("Invalid SS58 identifier. Error: {:?}", e); - false - }, - } - } } diff --git a/pallets/registries/src/tests.rs b/pallets/registries/src/tests.rs index b611138bf..64b6e00b8 100644 --- a/pallets/registries/src/tests.rs +++ b/pallets/registries/src/tests.rs @@ -58,7 +58,6 @@ fn add_delegate_should_succeed() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob) @@ -108,7 +107,6 @@ fn add_admin_delegate_should_succeed() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob) @@ -158,7 +156,6 @@ fn add_admin_delegate_should_fail_if_admin_delegate_already_exists() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob) @@ -218,7 +215,6 @@ fn add_delegator_should_succeed() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob) @@ -267,7 +263,6 @@ fn add_delegator_should_fail_if_delegator_already_exists() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob) @@ -425,7 +420,6 @@ fn add_delegate_should_fail_if_the_regisrty_is_revoked() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob) @@ -484,7 +478,6 @@ fn add_delegate_should_fail_if_a_non_delegate_tries_to_add() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob) @@ -536,7 +529,6 @@ fn add_delegate_should_fail_if_delegate_already_exists() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob) @@ -572,12 +564,6 @@ fn creating_a_new_registries_should_succeed() { let registry_digest = ::Hashing::hash(®istry.encode()[..]); - let id_digest = ::Hashing::hash( - &[®istry_digest.encode()[..], &creator.encode()[..]].concat()[..], - ); - - let registry_id: RegistryIdOf = generate_registry_id::(&id_digest); - let raw_schema = [2u8; 256].to_vec(); let schema: InputSchemaOf = BoundedVec::try_from(raw_schema) .expect("Test Schema should fit into the expected input length of for the test runtime."); @@ -588,7 +574,6 @@ fn creating_a_new_registries_should_succeed() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob), @@ -607,12 +592,6 @@ fn creating_a_duplicate_registries_should_fail() { let registry_digest = ::Hashing::hash(®istry.encode()[..]); - let id_digest = ::Hashing::hash( - &[®istry_digest.encode()[..], &creator.encode()[..]].concat()[..], - ); - - let registry_id: RegistryIdOf = generate_registry_id::(&id_digest); - let raw_schema = [2u8; 256].to_vec(); let schema: InputSchemaOf = BoundedVec::try_from(raw_schema) .expect("Test Schema should fit into the expected input length of for the test runtime."); @@ -623,7 +602,6 @@ fn creating_a_duplicate_registries_should_fail() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -632,7 +610,6 @@ fn creating_a_duplicate_registries_should_fail() { assert_err!( Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, None, Some(blob), @@ -675,7 +652,6 @@ fn revoking_a_registry_should_succeed() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -723,7 +699,6 @@ fn reinstating_an_revoked_a_registry_should_succeed() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -783,7 +758,6 @@ fn reinstating_an_non_revoked_a_registry_should_fail() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -833,7 +807,6 @@ fn archiving_a_registry_should_succeed() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -881,7 +854,6 @@ fn restoring_an_archived_a_registry_should_succeed() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -941,7 +913,6 @@ fn restoring_an_non_archived_a_registry_should_fail() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -986,7 +957,6 @@ fn registry_delegation_should_fail_if_registry_delegates_limit_exceeded() { // Create the Registries assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -1057,7 +1027,6 @@ fn remove_delegate_should_succeed() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -1113,7 +1082,6 @@ fn remove_delegate_should_fail_for_creator_removing_themselves() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -1177,7 +1145,6 @@ fn update_registry_should_succeed() { new_test_ext().execute_with(|| { assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(initial_blob), @@ -1245,7 +1212,6 @@ fn add_delegate_should_fail_if_registry_delegates_limit_exceeded() { // Create the Registries assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -1315,7 +1281,6 @@ fn add_admin_delegate_should_fail_if_registry_delegates_limit_exceeded() { // Create the Registries assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()), @@ -1385,7 +1350,6 @@ fn add_delegator_should_fail_if_registry_delegates_limit_exceeded() { // Create the Registries assert_ok!(Registries::create( frame_system::RawOrigin::Signed(creator.clone()).into(), - registry_id.clone(), registry_digest, Some(schema_id), Some(blob.clone()),