diff --git a/src/storage/data_directory.rs b/src/storage/data_directory.rs index 48c9dded27..c56f25e0fc 100644 --- a/src/storage/data_directory.rs +++ b/src/storage/data_directory.rs @@ -319,7 +319,7 @@ mod tests { fn succeed_adding_content() { with_default_mock_builder(|| { // Register a content with 1234 bytes of type 1, which should be recognized. - let res = TestDataDirectory::add_content(Origin::signed(1), 1, 1234, None); + let res = TestDataDirectory::add_content(Origin::signed(1), 1, 1234, 0); assert!(res.is_ok()); }); } @@ -327,26 +327,27 @@ mod tests { #[test] fn accept_content_as_liaison() { with_default_mock_builder(|| { - let res = TestDataDirectory::add_content(Origin::signed(1), 1, 1234, None); + let sender = 1 as u64; + let res = TestDataDirectory::add_content(Origin::signed(sender), 1, 1234, 0); assert!(res.is_ok()); // An appropriate event should have been fired. - let (content_id, liaison) = match System::events().last().unwrap().event { + let (content_id, creator) = match System::events().last().unwrap().event { MetaEvent::data_directory(data_directory::RawEvent::ContentAdded( content_id, - liaison, - )) => (content_id, liaison), + creator, + )) => (content_id, creator), _ => (0u64, 0xdeadbeefu64), // invalid value, unlikely to match }; - assert_ne!(liaison, 0xdeadbeefu64); - assert_eq!(liaison, TEST_MOCK_LIAISON); + assert_ne!(creator, 0xdeadbeefu64); + assert_eq!(creator, sender); // Accepting content should not work with some random origin let res = TestDataDirectory::accept_content(Origin::signed(1), content_id); assert!(res.is_err()); // However, with the liaison as origin it should. - let res = TestDataDirectory::accept_content(Origin::signed(liaison), content_id); + let res = TestDataDirectory::accept_content(Origin::signed(TEST_MOCK_LIAISON), content_id); assert!(res.is_ok()); }); } @@ -354,26 +355,27 @@ mod tests { #[test] fn reject_content_as_liaison() { with_default_mock_builder(|| { - let res = TestDataDirectory::add_content(Origin::signed(1), 1, 1234, None); + let sender = 1 as u64; + let res = TestDataDirectory::add_content(Origin::signed(sender), 1, 1234, 0); assert!(res.is_ok()); // An appropriate event should have been fired. - let (content_id, liaison) = match System::events().last().unwrap().event { + let (content_id, creator) = match System::events().last().unwrap().event { MetaEvent::data_directory(data_directory::RawEvent::ContentAdded( content_id, - liaison, - )) => (content_id, liaison), + creator, + )) => (content_id, creator), _ => (0u64, 0xdeadbeefu64), // invalid value, unlikely to match }; - assert_ne!(liaison, 0xdeadbeefu64); - assert_eq!(liaison, TEST_MOCK_LIAISON); + assert_ne!(creator, 0xdeadbeefu64); + assert_eq!(creator, sender); // Rejecting content should not work with some random origin let res = TestDataDirectory::reject_content(Origin::signed(1), content_id); assert!(res.is_err()); // However, with the liaison as origin it should. - let res = TestDataDirectory::reject_content(Origin::signed(liaison), content_id); + let res = TestDataDirectory::reject_content(Origin::signed(TEST_MOCK_LIAISON), content_id); assert!(res.is_ok()); }); } diff --git a/src/storage/data_object_type_registry.rs b/src/storage/data_object_type_registry.rs index bc7ce0f1c2..8dd6bad1d0 100644 --- a/src/storage/data_object_type_registry.rs +++ b/src/storage/data_object_type_registry.rs @@ -77,7 +77,7 @@ decl_module! { pub struct Module for enum Call where origin: T::Origin { fn deposit_event() = default; - fn on_initialise() { + fn on_initialize() { // Create a default data object type if it was not created yet. if CREATE_DETAULT_TYPE && !>::exists(Self::first_data_object_type_id()) { let do_type: DataObjectType = DataObjectType::default(); @@ -163,26 +163,13 @@ mod tests { } #[test] - fn fail_register_without_root() { + fn succeed_register() { with_default_mock_builder(|| { let data: TestDataObjectType = TestDataObjectType { description: "foo".as_bytes().to_vec(), active: false, }; - let res = - TestDataObjectTypeRegistry::register_data_object_type(Origin::signed(1), data); - assert!(res.is_err()); - }); - } - - #[test] - fn succeed_register_as_root() { - with_default_mock_builder(|| { - let data: TestDataObjectType = TestDataObjectType { - description: "foo".as_bytes().to_vec(), - active: false, - }; - let res = TestDataObjectTypeRegistry::register_data_object_type(Origin::ROOT, data); + let res = TestDataObjectTypeRegistry::register_data_object_type(data); assert!(res.is_ok()); }); } @@ -195,7 +182,7 @@ mod tests { description: "foo".as_bytes().to_vec(), active: false, }; - let id_res = TestDataObjectTypeRegistry::register_data_object_type(Origin::ROOT, data); + let id_res = TestDataObjectTypeRegistry::register_data_object_type(data); assert!(id_res.is_ok()); let dot_id = match System::events().last().unwrap().event { @@ -213,7 +200,6 @@ mod tests { active: false, }; let res = TestDataObjectTypeRegistry::update_data_object_type( - Origin::ROOT, dot_id + 1, updated1, ); @@ -225,7 +211,7 @@ mod tests { active: false, }; let res = - TestDataObjectTypeRegistry::update_data_object_type(Origin::ROOT, dot_id, updated3); + TestDataObjectTypeRegistry::update_data_object_type(dot_id, updated3); assert!(res.is_ok()); assert_eq!( *System::events().last().unwrap(), @@ -247,7 +233,7 @@ mod tests { description: "foo".as_bytes().to_vec(), active: false, }; - let id_res = TestDataObjectTypeRegistry::register_data_object_type(Origin::ROOT, data); + let id_res = TestDataObjectTypeRegistry::register_data_object_type(data); assert!(id_res.is_ok()); assert_eq!( *System::events().last().unwrap(), @@ -268,7 +254,6 @@ mod tests { // Now activate the data object type let res = TestDataObjectTypeRegistry::activate_data_object_type( - Origin::ROOT, TEST_FIRST_DATA_OBJECT_TYPE_ID, ); assert!(res.is_ok()); @@ -291,7 +276,6 @@ mod tests { // Deactivate again. let res = TestDataObjectTypeRegistry::deactivate_data_object_type( - Origin::ROOT, TEST_FIRST_DATA_OBJECT_TYPE_ID, ); assert!(res.is_ok()); diff --git a/src/storage/mock.rs b/src/storage/mock.rs index 6b0b8394e3..3cc19efe02 100644 --- a/src/storage/mock.rs +++ b/src/storage/mock.rs @@ -98,11 +98,12 @@ impl traits::ContentIdExists for MockContent { ) -> Result, &'static str> { match *which { TEST_MOCK_EXISTING_CID => Ok(data_directory::DataObject { - data_object_type: 1, - signing_key: None, + type_id: 1, size: 1234, - added_at_block: 10, - added_at_time: 1024, + added_at: data_directory::BlockAndTime { + block: 10, + time: 1024, + }, owner: 1, liaison: TEST_MOCK_LIAISON, liaison_judgement: data_directory::LiaisonJudgement::Pending, @@ -142,6 +143,7 @@ impl data_directory::Trait for Test { type Members = MockMembers; type Roles = MockRoles; type IsActiveDataObjectType = AnyDataObjectTypeIsActive; + type SchemaId = u64; } impl data_object_storage_registry::Trait for Test { @@ -242,15 +244,6 @@ impl ExtBuilder { .0, ); - t.extend( - data_directory::GenesisConfig:: { - first_content_id: self.first_content_id, - } - .build_storage() - .unwrap() - .0, - ); - t.extend( data_object_storage_registry::GenesisConfig:: { first_relationship_id: self.first_relationship_id,