Update nft (#308)

* bumo orml-nft

* avoid share token id between classes

nft/Cargo.toml

@@ -3,7 +3,7 @@ name = "orml-nft"
 description = "Non-fungible token pallet provides basic functions to create and manager NFT"
 repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/nft"
 license = "Apache-2.0"
-version = "0.3.3-dev"
+version = "0.3.4-dev"
 authors = ["Acala Developers"]
 edition = "2018"
 

nft/src/lib.rs

@@ -96,7 +96,7 @@ decl_storage! {
 		/// Next available class ID.
 		pub NextClassId get(fn next_class_id): T::ClassId;
 		/// Next available token ID.
-		pub NextTokenId get(fn next_token_id): T::TokenId;
+		pub NextTokenId get(fn next_token_id): map hasher(twox_64_concat) T::ClassId => T::TokenId;
 		/// Store class info.
 		///
 		/// Returns `None` if class info not set or removed.
@@ -166,7 +166,7 @@ impl<T: Trait> Module<T> {
 		metadata: Vec<u8>,
 		data: T::TokenData,
 	) -> Result<T::TokenId, DispatchError> {
-		NextTokenId::<T>::try_mutate(|id| -> Result<T::TokenId, DispatchError> {
+		NextTokenId::<T>::try_mutate(class_id, |id| -> Result<T::TokenId, DispatchError> {
 			let token_id = *id;
 			*id = id.checked_add(&One::one()).ok_or(Error::<T>::NoAvailableTokenId)?;
 
@@ -217,6 +217,9 @@ impl<T: Trait> Module<T> {
 			let info = class_info.take().ok_or(Error::<T>::ClassNotFound)?;
 			ensure!(info.owner == *owner, Error::<T>::NoPermission);
 			ensure!(info.total_issuance == Zero::zero(), Error::<T>::CannotDestroyClass);
+
+			NextTokenId::<T>::remove(class_id);
+
 			Ok(())
 		})
 	}

nft/src/mock.rs

@@ -65,9 +65,9 @@ pub type NonFungibleTokenModule = Module<Runtime>;
 pub const ALICE: AccountId = 1;
 pub const BOB: AccountId = 2;
 pub const CLASS_ID: <Runtime as Trait>::ClassId = 0;
-pub const CLASS_ID_NOT_EXIST: <Runtime as Trait>::ClassId = 1;
+pub const CLASS_ID_NOT_EXIST: <Runtime as Trait>::ClassId = 100;
 pub const TOKEN_ID: <Runtime as Trait>::TokenId = 0;
-pub const TOKEN_ID_NOT_EXIST: <Runtime as Trait>::TokenId = 1;
+pub const TOKEN_ID_NOT_EXIST: <Runtime as Trait>::TokenId = 100;
 
 pub struct ExtBuilder;
 

nft/src/tests.rs

@@ -29,8 +29,22 @@ fn create_class_should_fail() {
 #[test]
 fn mint_should_work() {
 	ExtBuilder::default().build().execute_with(|| {
+		let next_class_id = NonFungibleTokenModule::next_class_id();
+		assert_eq!(next_class_id, CLASS_ID);
 		assert_ok!(NonFungibleTokenModule::create_class(&ALICE, vec![1], ()));
+		assert_eq!(NonFungibleTokenModule::next_token_id(CLASS_ID), 0);
 		assert_ok!(NonFungibleTokenModule::mint(&BOB, CLASS_ID, vec![1], ()));
+		assert_eq!(NonFungibleTokenModule::next_token_id(CLASS_ID), 1);
+		assert_ok!(NonFungibleTokenModule::mint(&BOB, CLASS_ID, vec![1], ()));
+		assert_eq!(NonFungibleTokenModule::next_token_id(CLASS_ID), 2);
+
+		let next_class_id = NonFungibleTokenModule::next_class_id();
+		assert_ok!(NonFungibleTokenModule::create_class(&ALICE, vec![1], ()));
+		assert_eq!(NonFungibleTokenModule::next_token_id(next_class_id), 0);
+		assert_ok!(NonFungibleTokenModule::mint(&BOB, next_class_id, vec![1], ()));
+		assert_eq!(NonFungibleTokenModule::next_token_id(next_class_id), 1);
+
+		assert_eq!(NonFungibleTokenModule::next_token_id(CLASS_ID), 2);
 	});
 }
 
@@ -46,7 +60,7 @@ fn mint_should_fail() {
 			Error::<Runtime>::NumOverflow
 		);
 
-		NextTokenId::<Runtime>::mutate(|id| *id = <Runtime as Trait>::TokenId::max_value());
+		NextTokenId::<Runtime>::mutate(CLASS_ID, |id| *id = <Runtime as Trait>::TokenId::max_value());
 		assert_noop!(
 			NonFungibleTokenModule::mint(&BOB, CLASS_ID, vec![1], ()),
 			Error::<Runtime>::NoAvailableTokenId
@@ -136,6 +150,8 @@ fn destroy_class_should_work() {
 		assert_ok!(NonFungibleTokenModule::mint(&BOB, CLASS_ID, vec![1], ()));
 		assert_ok!(NonFungibleTokenModule::burn(&BOB, (CLASS_ID, TOKEN_ID)));
 		assert_ok!(NonFungibleTokenModule::destroy_class(&ALICE, CLASS_ID));
+		assert_eq!(Classes::<Runtime>::contains_key(CLASS_ID), false);
+		assert_eq!(NextTokenId::<Runtime>::contains_key(CLASS_ID), false);
 	});
 }