mdBook generated from gitorial

src/0/source/README.md

@@ -1 +1,9 @@
 # Kitties Tutorial
+
+Welcome to the new Substrate Collectables Workshop.
+
+TODO: Content.
+	- Blockchain
+	- Runtime
+	- Pallet
+	- NFTs

src/0/source/changes.diff

@@ -4082,10 +4082,10 @@ index 0000000..2e09572
 +try-runtime = []
 diff --git a/src/lib.rs b/src/lib.rs
 new file mode 100644
-index 0000000..80f2418
+index 0000000..8b9507e
 --- /dev/null
 +++ b/src/lib.rs
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,43 @@
 +#![cfg_attr(not(feature = "std"), no_std)]
 +
 +pub use pallet::*;
@@ -4117,14 +4117,15 @@ index 0000000..80f2418
 +	impl<T: Config> Pallet<T> {
 +		pub fn create_kitty(origin: OriginFor<T>) -> DispatchResult {
 +			let who = ensure_signed(origin)?;
-+			Self::mint(who);
++			Self::mint(who)?;
 +			Ok(())
 +		}
 +	}
 +
 +	impl<T: Config> Pallet<T> {
-+		fn mint(owner: T::AccountId) {
++		fn mint(owner: T::AccountId) -> DispatchResult {
 +			Self::deposit_event(Event::<T>::Created { owner });
++			Ok(())
 +		}
 +	}
 +}

src/0/source/src/lib.rs

@@ -29,14 +29,15 @@ pub mod pallet {
 	impl<T: Config> Pallet<T> {
 		pub fn create_kitty(origin: OriginFor<T>) -> DispatchResult {
 			let who = ensure_signed(origin)?;
-			Self::mint(who);
+			Self::mint(who)?;
 			Ok(())
 		}
 	}
 
 	impl<T: Config> Pallet<T> {
-		fn mint(owner: T::AccountId) {
+		fn mint(owner: T::AccountId) -> DispatchResult {
 			Self::deposit_event(Event::<T>::Created { owner });
+			Ok(())
 		}
 	}
 }

src/1/source/README.md

@@ -1 +1,3 @@
-# Kitties Tutorial
+# FRAME Macros
+
+- TODO: Teach the basics of FRAME macros.

src/1/source/changes.diff

@@ -1,5 +1,5 @@
 diff --git a/src/lib.rs b/src/lib.rs
-index 80f2418..09a9d86 100644
+index 8b9507e..44cc2ec 100644
 --- a/src/lib.rs
 +++ b/src/lib.rs
 @@ -2,6 +2,7 @@

src/1/source/src/lib.rs

@@ -30,14 +30,15 @@ pub mod pallet {
 	impl<T: Config> Pallet<T> {
 		pub fn create_kitty(origin: OriginFor<T>) -> DispatchResult {
 			let who = ensure_signed(origin)?;
-			Self::mint(who);
+			Self::mint(who)?;
 			Ok(())
 		}
 	}
 
 	impl<T: Config> Pallet<T> {
-		fn mint(owner: T::AccountId) {
+		fn mint(owner: T::AccountId) -> DispatchResult {
 			Self::deposit_event(Event::<T>::Created { owner });
+			Ok(())
 		}
 	}
 }

src/10/README.md

@@ -2,25 +2,44 @@
 <div class="content-row">
 <div class="content-col">
 
-{{#include ./source/README.md}}
+{{#include ./template/README.md}}
 
 </div>
+
 <div class="content-col">
 
 <div class="tab">
-  <button class="maintab tablinks active" onclick="switchMainTab(event, 'Source')">Source</button>
+  <button class="maintab tablinks active" onclick="switchMainTab(event, 'Template')">Template</button>
+  <button class="maintab tablinks" onclick="switchMainTab(event, 'Solution')">Solution</button>
   <button class="maintab tablinks" onclick="switchMainTab(event, 'Diff')">Diff</button>
 </div>
 
-<div id="Source" class="maintab tabcontent active">
+<div id="Template" class="maintab tabcontent active">
 
 <div class="tab">
-<button class="subtab tablinks file-source file-modified active" onclick="switchSubTab(event, 'src/lib.rs')" data-id="src/lib.rs">src/lib.rs</button>
+<button class="subtab tablinks file-template file-modified active" onclick="switchSubTab(event, 'src/lib.rs')" data-id="src/lib.rs">src/lib.rs</button>
 </div>
-<div id="source/src/lib.rs" class="subtab tabcontent active" data-id="src/lib.rs">
+<div id="template/src/lib.rs" class="subtab tabcontent active" data-id="src/lib.rs">
 
 ```rust
-{{#include ./source/src/lib.rs}}
+{{#include ./template/src/lib.rs}}
+```
+
+</div>
+
+
+
+</div>
+
+<div id="Solution" class="maintab tabcontent">
+
+<div class="tab">
+<button class="subtab tablinks file-solution file-modified active" onclick="switchSubTab(event, 'src/lib.rs')" data-id="src/lib.rs">src/lib.rs</button>
+</div>
+<div id="solution/src/lib.rs" class="subtab tabcontent active" data-id="src/lib.rs">
+
+```rust
+{{#include ./solution/src/lib.rs}}
 ```
 
 </div>
@@ -33,12 +52,20 @@
 
 
 <div class="tab">
-	<button class="difftab tablinks active" onclick="switchDiff(event, 'changes.diff')" data-id="changes.diff">changes.diff</button>
+	<button class="difftab tablinks active" onclick="switchDiff(event, 'template.diff')" data-id="template.diff">template.diff</button>
+	<button class="difftab tablinks" onclick="switchDiff(event, 'solution.diff')" data-id="solution.diff">solution.diff</button>
+</div>
+<div id="template.diff" class="difftab tabcontent active" data-id="template.diff">
+
+```diff
+{{#include ./template/template.diff}}
+```
+
 </div>
-<div id="changes.diff" class="difftab tabcontent active" data-id="changes.diff">
+<div id="solution.diff" class="difftab tabcontent" data-id="solution.diff">
 
 ```diff
-{{#include ./source/changes.diff}}
+{{#include ./solution/solution.diff}}
 ```
 
 </div>

src/10/solution/README.md

@@ -0,0 +1,3 @@
+# Solution
+
+Here you will find the solution for the previous step.

src/10/solution/solution.diff

@@ -0,0 +1,28 @@
+diff --git a/src/lib.rs b/src/lib.rs
+index 3b445c2..446ce3c 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -22,8 +22,7 @@ pub mod pallet {
+
+ 	/// Learn about storage value.
+ 	#[pallet::storage]
+-	/* TODO: Update this storage to use a `QueryKind` of `ValueQuery`. */
+-	pub(super) type CountForKitties<T: Config> = StorageValue<Value = u64>;
++	pub(super) type CountForKitties<T: Config> = StorageValue<Value = u64, QueryKind = ValueQuery>;
+
+ 	// Learn about events.
+ 	#[pallet::event]
+@@ -52,11 +51,9 @@ pub mod pallet {
+ 	impl<T: Config> Pallet<T> {
+ 		// Learn about `AccountId`.
+ 		fn mint(owner: T::AccountId) -> DispatchResult {
+-			/* TODO: Remove the `unwrap_or` which is not needed when using `ValueQuery`. */
+-			let current_count: u64 = CountForKitties::<T>::get().unwrap_or(0);
++			let current_count: u64 = CountForKitties::<T>::get();
+ 			let new_count = current_count.checked_add(1).ok_or(Error::<T>::TooManyKitties)?;
+-			/* TODO: Remove the `Option` wrapper when setting the `new_count`. */
+-			CountForKitties::<T>::set(Some(new_count));
++			CountForKitties::<T>::set(new_count);
+ 			Self::deposit_event(Event::<T>::Created { owner });
+ 			Ok(())
+ 		}

src/11/template/src/lib.rs → src/10/solution/src/lib.rs

@@ -22,11 +22,7 @@ pub mod pallet {
 
 	/// Learn about storage value.
 	#[pallet::storage]
-	pub(super) type CountForKitties<T: Config> = StorageValue<Value = u64>;
-
-	/// Learn about storage maps.
-	#[pallet::storage]
-	pub(super) type Kitties<T: Config> = StorageMap<Key = [u8; 16], Value = ()>;
+	pub(super) type CountForKitties<T: Config> = StorageValue<Value = u64, QueryKind = ValueQuery>;
 
 	// Learn about events.
 	#[pallet::event]
@@ -46,8 +42,6 @@ pub mod pallet {
 		pub fn create_kitty(origin: OriginFor<T>) -> DispatchResult {
 			// Learn about `origin`.
 			let who = ensure_signed(origin)?;
-			/* TODO: Create `const default_id`, which type `[u8; 16]` and has value `[0u8; 16]`. */
-			/* TODO: Pass `default_id` to the `mint` function. */
 			Self::mint(who)?;
 			Ok(())
 		}
@@ -56,12 +50,10 @@ pub mod pallet {
 	// Learn about internal functions.
 	impl<T: Config> Pallet<T> {
 		// Learn about `AccountId`.
-		/* TODO: Update this function signature to include `id` which is type `[u8; 16]`. */
 		fn mint(owner: T::AccountId) -> DispatchResult {
-			let current_count = CountForKitties::<T>::get().unwrap_or(0);
+			let current_count: u64 = CountForKitties::<T>::get();
 			let new_count = current_count.checked_add(1).ok_or(Error::<T>::TooManyKitties)?;
-			/* TODO: In the `Kitties` map, under the key `id`, insert `()`. */
-			CountForKitties::<T>::set(Some(new_count));
+			CountForKitties::<T>::set(new_count);
 			Self::deposit_event(Event::<T>::Created { owner });
 			Ok(())
 		}

src/10/template/README.md

@@ -0,0 +1,6 @@
+# Value Query
+
+- TODO:
+	- Explain storage as an option
+	- Explain `OptionQuery` and `ValueQuery`
+	- Explain default value

src/11/solution/src/lib.rs → src/10/template/src/lib.rs

@@ -22,12 +22,9 @@ pub mod pallet {
 
 	/// Learn about storage value.
 	#[pallet::storage]
+	/* TODO: Update this storage to use a `QueryKind` of `ValueQuery`. */
 	pub(super) type CountForKitties<T: Config> = StorageValue<Value = u64>;
 
-	/// Learn about storage maps.
-	#[pallet::storage]
-	pub(super) type Kitties<T: Config> = StorageMap<Key = [u8; 16], Value = ()>;
-
 	// Learn about events.
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
@@ -46,19 +43,19 @@ pub mod pallet {
 		pub fn create_kitty(origin: OriginFor<T>) -> DispatchResult {
 			// Learn about `origin`.
 			let who = ensure_signed(origin)?;
-			let dna = [0u8; 16];
-			Self::mint(who, dna)?;
+			Self::mint(who)?;
 			Ok(())
 		}
 	}
 
 	// Learn about internal functions.
 	impl<T: Config> Pallet<T> {
 		// Learn about `AccountId`.
-		fn mint(owner: T::AccountId, dna: [u8; 16]) -> DispatchResult {
-			let current_count = CountForKitties::<T>::get().unwrap_or(0);
+		fn mint(owner: T::AccountId) -> DispatchResult {
+			/* TODO: Remove the `unwrap_or` which is not needed when using `ValueQuery`. */
+			let current_count: u64 = CountForKitties::<T>::get().unwrap_or(0);
 			let new_count = current_count.checked_add(1).ok_or(Error::<T>::TooManyKitties)?;
-			Kitties::<T>::insert(dna, ());
+			/* TODO: Remove the `Option` wrapper when setting the `new_count`. */
 			CountForKitties::<T>::set(Some(new_count));
 			Self::deposit_event(Event::<T>::Created { owner });
 			Ok(())

src/10/template/template.diff

@@ -0,0 +1,23 @@
+diff --git a/src/lib.rs b/src/lib.rs
+index 2ed0e74..3b445c2 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -22,6 +22,7 @@ pub mod pallet {
+
+ 	/// Learn about storage value.
+ 	#[pallet::storage]
++	/* TODO: Update this storage to use a `QueryKind` of `ValueQuery`. */
+ 	pub(super) type CountForKitties<T: Config> = StorageValue<Value = u64>;
+
+ 	// Learn about events.
+@@ -51,8 +52,10 @@ pub mod pallet {
+ 	impl<T: Config> Pallet<T> {
+ 		// Learn about `AccountId`.
+ 		fn mint(owner: T::AccountId) -> DispatchResult {
++			/* TODO: Remove the `unwrap_or` which is not needed when using `ValueQuery`. */
+ 			let current_count: u64 = CountForKitties::<T>::get().unwrap_or(0);
+ 			let new_count = current_count.checked_add(1).ok_or(Error::<T>::TooManyKitties)?;
++			/* TODO: Remove the `Option` wrapper when setting the `new_count`. */
+ 			CountForKitties::<T>::set(Some(new_count));
+ 			Self::deposit_event(Event::<T>::Created { owner });
+ 			Ok(())

src/11/README.md

@@ -2,44 +2,25 @@
 <div class="content-row">
 <div class="content-col">
 
-{{#include ./template/README.md}}
+{{#include ./source/README.md}}
 
 </div>
-
 <div class="content-col">
 
 <div class="tab">
-  <button class="maintab tablinks active" onclick="switchMainTab(event, 'Template')">Template</button>
-  <button class="maintab tablinks" onclick="switchMainTab(event, 'Solution')">Solution</button>
+  <button class="maintab tablinks active" onclick="switchMainTab(event, 'Source')">Source</button>
   <button class="maintab tablinks" onclick="switchMainTab(event, 'Diff')">Diff</button>
 </div>
 
-<div id="Template" class="maintab tabcontent active">
+<div id="Source" class="maintab tabcontent active">
 
 <div class="tab">
-<button class="subtab tablinks file-template file-modified active" onclick="switchSubTab(event, 'src/lib.rs')" data-id="src/lib.rs">src/lib.rs</button>
+<button class="subtab tablinks file-source file-modified active" onclick="switchSubTab(event, 'src/lib.rs')" data-id="src/lib.rs">src/lib.rs</button>
 </div>
-<div id="template/src/lib.rs" class="subtab tabcontent active" data-id="src/lib.rs">
+<div id="source/src/lib.rs" class="subtab tabcontent active" data-id="src/lib.rs">
 
 ```rust
-{{#include ./template/src/lib.rs}}
-```
-
-</div>
-
-
-
-</div>
-
-<div id="Solution" class="maintab tabcontent">
-
-<div class="tab">
-<button class="subtab tablinks file-solution file-modified active" onclick="switchSubTab(event, 'src/lib.rs')" data-id="src/lib.rs">src/lib.rs</button>
-</div>
-<div id="solution/src/lib.rs" class="subtab tabcontent active" data-id="src/lib.rs">
-
-```rust
-{{#include ./solution/src/lib.rs}}
+{{#include ./source/src/lib.rs}}
 ```
 
 </div>
@@ -52,20 +33,12 @@
 
 
 <div class="tab">
-	<button class="difftab tablinks active" onclick="switchDiff(event, 'template.diff')" data-id="template.diff">template.diff</button>
-	<button class="difftab tablinks" onclick="switchDiff(event, 'solution.diff')" data-id="solution.diff">solution.diff</button>
-</div>
-<div id="template.diff" class="difftab tabcontent active" data-id="template.diff">
-
-```diff
-{{#include ./template/template.diff}}
-```
-
+	<button class="difftab tablinks active" onclick="switchDiff(event, 'changes.diff')" data-id="changes.diff">changes.diff</button>
 </div>
-<div id="solution.diff" class="difftab tabcontent" data-id="solution.diff">
+<div id="changes.diff" class="difftab tabcontent active" data-id="changes.diff">
 
 ```diff
-{{#include ./solution/solution.diff}}
+{{#include ./source/changes.diff}}
 ```
 
 </div>