Merge pull request #22 from gear-foundation/tm/minor-fix

Fix notify event
gear-foundation · Aug 29, 2024 · e39dc6c · e39dc6c
2 parents 56bb007 + adafda0
commit e39dc6c
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 15 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/extended-vft/.DS_Store b/extended-vft/.DS_Store
diff --git a/extended-vft/.gitignore b/extended-vft/.gitignore
@@ -1,3 +1,4 @@
 /target
 ./wasm/.binpath
 ./wasm/.DS_Store
+/.DS_Store
diff --git a/extended-vft/app/src/services/extended_vft/mod.rs b/extended-vft/app/src/services/extended_vft/mod.rs
@@ -70,7 +70,8 @@ impl ExtendedService {
             funcs::mint(Storage::balances(), Storage::total_supply(), to, value)
         });
         if mutated {
-            let _ = self.notify_on(Event::Minted { to, value });
+            self.notify_on(Event::Minted { to, value })
+                .expect("Notification Error");
         }
         mutated
     }
@@ -84,7 +85,8 @@ impl ExtendedService {
             funcs::burn(Storage::balances(), Storage::total_supply(), from, value)
         });
         if mutated {
-            let _ = self.notify_on(Event::Burned { from, value });
+            self.notify_on(Event::Burned { from, value })
+                .expect("Notification Error");
         }
         mutated
     }

diff --git a/extended-vft/wasm/.DS_Store b/extended-vft/wasm/.DS_Store
diff --git a/extended-vnft/.DS_Store b/extended-vnft/.DS_Store
diff --git a/extended-vnft/.gitignore b/extended-vnft/.gitignore
@@ -1,3 +1,4 @@
 /target
 ./wasm/.binpath
 ./wasm/.DS_Store
+/.DS_Store
diff --git a/extended-vnft/app/src/services/extended_vnft/mod.rs b/extended-vnft/app/src/services/extended_vnft/mod.rs
@@ -97,7 +97,8 @@ impl ExtendedService {
                 token_metadata.clone(),
             )
         });
-        let _ = self.notify_on(Event::Minted { to, token_metadata });
+        self.notify_on(Event::Minted { to, token_metadata })
+            .expect("Notification Error");
     }
 
     pub fn burn(&mut self, from: ActorId, token_id: TokenId) {
@@ -113,7 +114,8 @@ impl ExtendedService {
                 token_id,
             )
         });
-        let _ = self.notify_on(Event::Burned { from, token_id });
+        self.notify_on(Event::Burned { from, token_id })
+            .expect("Notification Error");
     }
 
     pub fn grant_admin_role(&mut self, to: ActorId) {

diff --git a/extended-vnft/wasm/.DS_Store b/extended-vnft/wasm/.DS_Store
diff --git a/vft-service/.DS_Store b/vft-service/.DS_Store
diff --git a/vft-service/.gitignore b/vft-service/.gitignore
@@ -1,3 +1,4 @@
 /target
 ./wasm/.binpath
-./wasm/.DS_Store
+/.DS_Store
+
diff --git a/vft-service/src/lib.rs b/vft-service/src/lib.rs
@@ -86,11 +86,12 @@ impl Service {
         let mutated = funcs::approve(&mut storage.allowances, owner, spender, value);
 
         if mutated {
-            let _ = self.notify_on(Event::Approval {
+            self.notify_on(Event::Approval {
                 owner,
                 spender,
                 value,
-            });
+            })
+            .expect("Notification Error");
         }
 
         mutated
@@ -103,7 +104,8 @@ impl Service {
             utils::panicking(move || funcs::transfer(&mut storage.balances, from, to, value));
 
         if mutated {
-            let _ = self.notify_on(Event::Transfer { from, to, value });
+            self.notify_on(Event::Transfer { from, to, value })
+                .expect("Notification Error");
         }
 
         mutated
@@ -124,7 +126,8 @@ impl Service {
         });
 
         if mutated {
-            let _ = self.notify_on(Event::Transfer { from, to, value });
+            self.notify_on(Event::Transfer { from, to, value })
+                .expect("Notification Error");
         }
 
         mutated

diff --git a/vnft-service/.DS_Store b/vnft-service/.DS_Store
diff --git a/vnft-service/.gitignore b/vnft-service/.gitignore
@@ -1,3 +1,3 @@
 /target
 ./wasm/.binpath
-./wasm/.DS_Store
+/.DS_Store
diff --git a/vnft-service/src/lib.rs b/vnft-service/src/lib.rs
@@ -90,11 +90,12 @@ impl Service {
                 token_id,
             )
         });
-        let _ = self.notify_on(Event::Approval {
+        self.notify_on(Event::Approval {
             owner,
             approved,
             token_id,
-        });
+        })
+        .expect("Notification Error");
     }
 
     pub fn transfer(&mut self, to: ActorId, token_id: TokenId) {
@@ -110,11 +111,12 @@ impl Service {
             )
         });
 
-        let _ = self.notify_on(Event::Transfer {
+        self.notify_on(Event::Transfer {
             from: source,
             to,
             token_id,
-        });
+        })
+        .expect("Notification Error");
     }
 
     pub fn transfer_from(&mut self, from: ActorId, to: ActorId, token_id: TokenId) {
@@ -131,7 +133,8 @@ impl Service {
             )
         });
 
-        let _ = self.notify_on(Event::Transfer { from, to, token_id });
+        self.notify_on(Event::Transfer { from, to, token_id })
+            .expect("Notification Error");
     }
 
     pub fn balance_of(&self, owner: ActorId) -> U256 {