git.delta.rocks / unique-network / refs/commits / b6babd242523

difftreelog

Merge branch 'master' of github.com:usetech-llc/nft_parachain

Greg Zaitsev2020-07-27parents: #e9291bd #9f0b3c2.patch.diff
in: master

4 files changed

modifiednode/src/chain_spec.rsdiffbeforeafterboth
--- a/node/src/chain_spec.rs
+++ b/node/src/chain_spec.rs
@@ -115,7 +115,7 @@
             balances: endowed_accounts
                 .iter()
                 .cloned()
-                .map(|k| (k, 1 << 60))
+                .map(|k| (k, 1 << 100))
                 .collect(),
         }),
         aura: Some(AuraConfig {
modifiedpallets/nft/src/lib.rsdiffbeforeafterboth
108 AccountId = <T as system::Trait>::AccountId,108 AccountId = <T as system::Trait>::AccountId,
109 {109 {
110 Created(u64, AccountId),110 Created(u64, AccountId),
111 ItemCreated(u64),111 ItemCreated(u64, u64),
112 ItemDestroyed(u64, u64),112 ItemDestroyed(u64, u64),
113 }113 }
114);114);
352 <ItemList<T>>::insert((collection_id, current_index), new_item);352 <ItemList<T>>::insert((collection_id, current_index), new_item);
353353
354 // call event354 // call event
355 Self::deposit_event(RawEvent::ItemCreated(collection_id));355 Self::deposit_event(RawEvent::ItemCreated(collection_id, current_index));
356356
357 Ok(())357 Ok(())
358 }358 }
modifiedsmart_contract/ink-types-node-runtime/.gitignorediffbeforeafterboth
--- a/smart_contract/ink-types-node-runtime/.gitignore
+++ b/smart_contract/ink-types-node-runtime/.gitignore
@@ -1,6 +1,6 @@
 # Ignore build artifacts
 /target/
-/**/target/
+/examples/**/target/
 
 # Ignore backup files creates by cargo fmt.
 **/*.rs.bk
@@ -13,4 +13,4 @@
 **/.vscode/**
 
 # Ignore history files.
-**/.history/**
+**/.history/**
\ No newline at end of file
modifiedsmart_contract/ink-types-node-runtime/calls/lib.rsdiffbeforeafterboth
--- a/smart_contract/ink-types-node-runtime/calls/lib.rs
+++ b/smart_contract/ink-types-node-runtime/calls/lib.rs
@@ -106,11 +106,6 @@
         }
 
         #[ink(message)]
-        fn get_test(&self) -> bool {
-            true
-        }
-
-        #[ink(message)]
         fn transfer_from(&self, collection_id: u64, item_id: u64, new_owner: AccountId) {
             env::println(&format!(
                 "transfer_from invoke_runtime params {:?}, {:?}, {:?} ",