difftreelog
warning removed
in: master
3 files changed
pallets/nft/src/lib.rsdiffbeforeafterboth1#![cfg_attr(not(feature = "std"), no_std)]1#![cfg_attr(not(feature = "std"), no_std)]223use codec::{Decode, Encode};3/// A FRAME pallet template with necessary imports4/// A FRAME pallet template with necessary imports455/// Feel free to remove or edit this file as needed.6/// Feel free to remove or edit this file as needed.9/// For more guidance on Substrate FRAME, see the example pallet10/// For more guidance on Substrate FRAME, see the example pallet10/// https://github.com/paritytech/substrate/blob/master/frame/example/src/lib.rs11/// https://github.com/paritytech/substrate/blob/master/frame/example/src/lib.rs1112use frame_support::{12use frame_support::{decl_event, decl_module, decl_storage, dispatch::DispatchResult, ensure};13 dispatch::DispatchResult, decl_module, decl_storage, decl_event,14 ensure,15};16use frame_system::{self as system, ensure_signed };13use frame_system::{self as system, ensure_signed};17use codec::{Encode, Decode};18use sp_runtime::sp_std::prelude::Vec;14use sp_runtime::sp_std::prelude::Vec;191520#[cfg(test)]16#[cfg(test)]82decl_event!(78decl_event!(83 pub enum Event<T> where AccountId = <T as system::Trait>::AccountId {79 pub enum Event<T>80 where81 AccountId = <T as system::Trait>::AccountId,82 {84 Created(u32, AccountId),83 Created(u32, AccountId),85 }84 }376 #[weight = frame_support::weights::SimpleDispatchInfo::default()]375 #[weight = frame_support::weights::SimpleDispatchInfo::default()]377 pub fn transfer_from(origin, collection_id: u64, item_id: u64, new_owner: T::AccountId) -> DispatchResult {376 pub fn transfer_from(origin, collection_id: u64, item_id: u64, new_owner: T::AccountId) -> DispatchResult {378379 // let sender = ensure_signed(origin)?;380 // ensure!(<Collection<T>>::contains_key(collection_id), "This collection does not exist");381382 // let target_collection = <Collection<T>>::get(collection_id);383 // let is_owner = sender == target_collection.owner;384385 // ensure!(<ItemList<T>>::contains_key((collection_id, item_id)), "Item does not exists");386 // let mut item = <ItemList<T>>::get((collection_id, item_id));387388 // if !is_owner 389 // {390 // let no_perm_mes = "You do not have permissions to modify this collection";391392 // // check if item owner393 // if item.owner != sender 394 // {395 // ensure!(<AdminList<T>>::contains_key(collection_id), no_perm_mes);396 // ensure!(<AdminList<T>>::get(collection_id).contains(&sender), no_perm_mes);397 // }398399 // ensure!(<ApprovedList<T>>::contains_key((collection_id, item_id)), no_perm_mes);400 // let list_itm = <ApprovedList<T>>::get((collection_id, item_id));401 // ensure!(list_itm.contains(&new_owner.clone()), no_perm_mes);402403 // }404405377406 let no_perm_mes = "You do not have permissions to modify this collection";378 let no_perm_mes = "You do not have permissions to modify this collection";407 ensure!(<ApprovedList<T>>::contains_key((collection_id, item_id)), no_perm_mes);379 ensure!(<ApprovedList<T>>::contains_key((collection_id, item_id)), no_perm_mes);408 let list_itm = <ApprovedList<T>>::get((collection_id, item_id));380 let list_itm = <ApprovedList<T>>::get((collection_id, item_id));409 ensure!(list_itm.contains(&new_owner.clone()), no_perm_mes);381 ensure!(list_itm.contains(&new_owner.clone()), no_perm_mes);410382411 Self::transfer(origin, collection_id, item_id, new_owner);383 Self::transfer(origin, collection_id, item_id, new_owner)?;412384413 Ok(())385 Ok(())414 }386 }pallets/nft/src/mock.rsdiffbeforeafterboth--- a/pallets/nft/src/mock.rs
+++ b/pallets/nft/src/mock.rs
@@ -1,15 +1,17 @@
// Creating mock runtime here
use crate::{Module, Trait};
+use frame_support::{impl_outer_origin, parameter_types, weights::Weight};
+use frame_system as system;
use sp_core::H256;
-use frame_support::{impl_outer_origin, parameter_types, weights::Weight};
use sp_runtime::{
- traits::{BlakeTwo256, IdentityLookup}, testing::Header, Perbill,
+ testing::Header,
+ traits::{BlakeTwo256, IdentityLookup},
+ Perbill,
};
-use frame_system as system;
impl_outer_origin! {
- pub enum Origin for Test {}
+ pub enum Origin for Test {}
}
// For testing the pallet, we construct most of a mock runtime. This means
@@ -18,39 +20,42 @@
#[derive(Clone, Eq, PartialEq)]
pub struct Test;
parameter_types! {
- pub const BlockHashCount: u64 = 250;
- pub const MaximumBlockWeight: Weight = 1024;
- pub const MaximumBlockLength: u32 = 2 * 1024;
- pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
+ pub const BlockHashCount: u64 = 250;
+ pub const MaximumBlockWeight: Weight = 1024;
+ pub const MaximumBlockLength: u32 = 2 * 1024;
+ pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
}
impl system::Trait for Test {
- type Origin = Origin;
- type Call = ();
- type Index = u64;
- type BlockNumber = u64;
- type Hash = H256;
- type Hashing = BlakeTwo256;
- type AccountId = u64;
- type Lookup = IdentityLookup<Self::AccountId>;
- type Header = Header;
- type Event = ();
- type BlockHashCount = BlockHashCount;
- type MaximumBlockWeight = MaximumBlockWeight;
- type MaximumBlockLength = MaximumBlockLength;
- type AvailableBlockRatio = AvailableBlockRatio;
- type Version = ();
- type ModuleToIndex = ();
- type AccountData = ();
- type OnNewAccount = ();
- type OnKilledAccount = ();
+ type Origin = Origin;
+ type Call = ();
+ type Index = u64;
+ type BlockNumber = u64;
+ type Hash = H256;
+ type Hashing = BlakeTwo256;
+ type AccountId = u64;
+ type Lookup = IdentityLookup<Self::AccountId>;
+ type Header = Header;
+ type Event = ();
+ type BlockHashCount = BlockHashCount;
+ type MaximumBlockWeight = MaximumBlockWeight;
+ type MaximumBlockLength = MaximumBlockLength;
+ type AvailableBlockRatio = AvailableBlockRatio;
+ type Version = ();
+ type ModuleToIndex = ();
+ type AccountData = ();
+ type OnNewAccount = ();
+ type OnKilledAccount = ();
}
impl Trait for Test {
- type Event = ();
+ type Event = ();
}
pub type TemplateModule = Module<Test>;
// This function basically just builds a genesis storage key/value store according to
// our desired mockup.
pub fn new_test_ext() -> sp_io::TestExternalities {
- system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
+ system::GenesisConfig::default()
+ .build_storage::<Test>()
+ .unwrap()
+ .into()
}
pallets/nft/src/tests.rsdiffbeforeafterboth--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -1,6 +1,6 @@
// Tests to be written here
-use crate::{ mock::*};
-use frame_support::{assert_ok, assert_noop};
+use crate::mock::*;
+use frame_support::{assert_noop, assert_ok};
#[test]
fn create_collection_test() {
@@ -14,69 +14,83 @@
#[test]
fn change_collection_owner() {
- new_test_ext().execute_with(|| {
+ new_test_ext().execute_with(|| {
let size = 1024;
let origin1 = Origin::signed(1);
assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
- assert_ok!(TemplateModule::change_collection_owner(origin1.clone(), 1, 2));
+ assert_ok!(TemplateModule::change_collection_owner(
+ origin1.clone(),
+ 1,
+ 2
+ ));
assert_eq!(TemplateModule::collection(1).owner, 2);
- });
+ });
}
#[test]
fn destroy_collection() {
- new_test_ext().execute_with(|| {
+ new_test_ext().execute_with(|| {
let size = 1024;
let origin1 = Origin::signed(1);
assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
assert_ok!(TemplateModule::destroy_collection(origin1.clone(), 1));
- });
+ });
}
#[test]
fn create_item() {
- new_test_ext().execute_with(|| {
+ new_test_ext().execute_with(|| {
let size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));
- assert_ok!(TemplateModule::create_item(origin2.clone(), 1, [1,1,1].to_vec()));
+ assert_ok!(TemplateModule::create_item(
+ origin2.clone(),
+ 1,
+ [1, 1, 1].to_vec()
+ ));
// check balance (collection with id = 1, user id = 2)
assert_eq!(TemplateModule::balance_count((1, 2)), 1);
- });
+ });
}
#[test]
fn burn_item() {
- new_test_ext().execute_with(|| {
+ new_test_ext().execute_with(|| {
let size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
assert_ok!(TemplateModule::create_collection(origin1.clone(), size));
assert_ok!(TemplateModule::add_collection_admin(origin1.clone(), 1, 2));
- assert_ok!(TemplateModule::create_item(origin2.clone(), 1, [1,1,1].to_vec()));
+ assert_ok!(TemplateModule::create_item(
+ origin2.clone(),
+ 1,
+ [1, 1, 1].to_vec()
+ ));
// check balance (collection with id = 1, user id = 2)
assert_eq!(TemplateModule::balance_count((1, 2)), 1);
// burn item
assert_ok!(TemplateModule::burn_item(origin1.clone(), 1, 1));
- assert_noop!(TemplateModule::burn_item(origin1.clone(), 1, 1), "Item does not exists");
+ assert_noop!(
+ TemplateModule::burn_item(origin1.clone(), 1, 1),
+ "Item does not exists"
+ );
assert_eq!(TemplateModule::balance_count((1, 1)), 0);
- });
+ });
}
-
#[test]
fn add_collection_admin() {
- new_test_ext().execute_with(|| {
+ new_test_ext().execute_with(|| {
let size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
@@ -96,12 +110,12 @@
assert_eq!(TemplateModule::admin_list_collection(1).contains(&2), true);
assert_eq!(TemplateModule::admin_list_collection(1).contains(&3), true);
- });
+ });
}
#[test]
fn remove_collection_admin() {
- new_test_ext().execute_with(|| {
+ new_test_ext().execute_with(|| {
let size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
@@ -123,14 +137,18 @@
assert_eq!(TemplateModule::admin_list_collection(1).contains(&3), true);
// remove admin
- assert_ok!(TemplateModule::remove_collection_admin(origin2.clone(), 1, 3));
+ assert_ok!(TemplateModule::remove_collection_admin(
+ origin2.clone(),
+ 1,
+ 3
+ ));
assert_eq!(TemplateModule::admin_list_collection(1).contains(&3), false);
- });
+ });
}
#[test]
fn balance_of() {
- new_test_ext().execute_with(|| {
+ new_test_ext().execute_with(|| {
let size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
@@ -148,17 +166,21 @@
assert_eq!(TemplateModule::balance_count((1, 1)), 0);
// create item
- assert_ok!(TemplateModule::create_item(origin1.clone(), 1, [1,1,1].to_vec()));
-
+ assert_ok!(TemplateModule::create_item(
+ origin1.clone(),
+ 1,
+ [1, 1, 1].to_vec()
+ ));
+
// check balance (collection with id = 1, user id = 2)
assert_eq!(TemplateModule::balance_count((1, 1)), 1);
- assert_eq!(TemplateModule::item_id((1,1)).owner, 1);
- });
+ assert_eq!(TemplateModule::item_id((1, 1)).owner, 1);
+ });
}
#[test]
fn transfer() {
- new_test_ext().execute_with(|| {
+ new_test_ext().execute_with(|| {
let size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
@@ -173,21 +195,25 @@
assert_eq!(TemplateModule::collection(3).owner, 3);
// create item
- assert_ok!(TemplateModule::create_item(origin1.clone(), 1, [1,1,1].to_vec()));
+ assert_ok!(TemplateModule::create_item(
+ origin1.clone(),
+ 1,
+ [1, 1, 1].to_vec()
+ ));
// transfer
assert_ok!(TemplateModule::transfer(origin1.clone(), 1, 1, 2));
- assert_eq!(TemplateModule::item_id((1,1)).owner, 2);
+ assert_eq!(TemplateModule::item_id((1, 1)).owner, 2);
// balance_of check
assert_eq!(TemplateModule::balance_count((1, 1)), 0);
assert_eq!(TemplateModule::balance_count((1, 2)), 1);
- });
+ });
}
#[test]
fn approve() {
- new_test_ext().execute_with(|| {
+ new_test_ext().execute_with(|| {
let size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
@@ -202,18 +228,21 @@
assert_eq!(TemplateModule::collection(3).owner, 3);
// create item
- assert_ok!(TemplateModule::create_item(origin1.clone(), 1, [1,1,1].to_vec()));
+ assert_ok!(TemplateModule::create_item(
+ origin1.clone(),
+ 1,
+ [1, 1, 1].to_vec()
+ ));
// approve
assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));
- assert_eq!(TemplateModule::approved((1,1)).contains(&2), true);
-
- });
+ assert_eq!(TemplateModule::approved((1, 1)).contains(&2), true);
+ });
}
#[test]
fn get_approved() {
- new_test_ext().execute_with(|| {
+ new_test_ext().execute_with(|| {
let size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
@@ -228,18 +257,21 @@
assert_eq!(TemplateModule::collection(3).owner, 3);
// create item
- assert_ok!(TemplateModule::create_item(origin1.clone(), 1, [1,1,1].to_vec()));
+ assert_ok!(TemplateModule::create_item(
+ origin1.clone(),
+ 1,
+ [1, 1, 1].to_vec()
+ ));
// approve
assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));
- assert_eq!(TemplateModule::approved((1,1)).contains(&2), true);
-
- });
+ assert_eq!(TemplateModule::approved((1, 1)).contains(&2), true);
+ });
}
#[test]
fn transfer_from() {
- new_test_ext().execute_with(|| {
+ new_test_ext().execute_with(|| {
let size = 1024;
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
@@ -254,11 +286,14 @@
assert_eq!(TemplateModule::collection(3).owner, 3);
// create item
- assert_ok!(TemplateModule::create_item(origin1.clone(), 1, [1,1,1].to_vec()));
+ assert_ok!(TemplateModule::create_item(
+ origin1.clone(),
+ 1,
+ [1, 1, 1].to_vec()
+ ));
// approve
assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));
assert_ok!(TemplateModule::transfer_from(origin1.clone(), 1, 1, 2));
-
- });
-}
\ No newline at end of file
+ });
+}