Remove unwrap and panic on Tx writeset missing (#53)

movementlabsxyz · Aug 7, 2024 · 338f9a1 · 338f9a1
1 parent 1c63a73
commit 338f9a1
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -466,7 +466,9 @@ ark-ff = "0.4.0"
 ark-groth16 = "0.4.0"
 ark-serialize = "0.4.0"
 ark-std = { version = "0.4.0", features = ["getrandom"] }
-aptos-moving-average = { git = "https://github.com/aptos-labs/aptos-indexer-processors.git", rev = "4801acae7aea30d7e96bbfbe5ec5b04056dfa4cf" }
+
+aptos-moving-average = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors" }
+
 assert_approx_eq = "1.1.0"
 assert_unordered = "0.3.5"
 async-channel = "1.7.1"

diff --git a/crates/indexer/src/models/move_tables.rs b/crates/indexer/src/models/move_tables.rs
@@ -56,6 +56,8 @@ impl TableItem {
         transaction_version: i64,
         transaction_block_height: i64,
     ) -> (Self, CurrentTableItem) {
+        println!("ICI indexer from_write_table_item write_table_item{write_table_item:?}",);
+
         (
             Self {
                 transaction_version,
@@ -64,7 +66,18 @@ impl TableItem {
                 key: write_table_item.key.to_string(),
                 table_handle: standardize_address(&write_table_item.handle.to_string()),
                 decoded_key: write_table_item.data.as_ref().unwrap().key.clone(),
-                decoded_value: Some(write_table_item.data.as_ref().unwrap().value.clone()),
+                decoded_value: Some(
+                    write_table_item
+                        .data
+                        .as_ref()
+                        .map::<serde_json::Value, _>(|data| data.value.clone())
+                        .unwrap_or_default(),
+                ),
+
+                // .unwrap().value.clone()),
+
+                // // .map::<serde_json::Value, _>(|value| value.clone().into())
+                // // .unwrap_or_default(), //Hack because Tx doesn't have data,
                 is_deleted: false,
             },
             CurrentTableItem {

diff --git a/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/convert.rs b/ecosystem/indexer-grpc/indexer-grpc-fullnode/src/convert.rs
@@ -383,13 +383,15 @@ pub fn convert_write_set_change(change: &WriteSetChange) -> transaction::WriteSe
             )),
         },
         WriteSetChange::WriteTableItem(write_table_item) => {
-            let data = write_table_item.data.as_ref().unwrap_or_else(|| {
-                panic!(
-                    "Could not extract data from DecodedTableData '{:?}' with handle '{:?}'",
-                    write_table_item,
-                    write_table_item.handle.to_string(),
-                )
-            });
+            let data = write_table_item
+                .data
+                .as_ref()
+                .map(|data| transaction::WriteTableData {
+                    key: data.key.to_string(),
+                    key_type: data.key_type.clone(),
+                    value: data.value.to_string(),
+                    value_type: data.value_type.clone(),
+                });
             transaction::WriteSetChange {
                 r#type: transaction::write_set_change::Type::WriteTableItem as i32,
                 change: Some(transaction::write_set_change::Change::WriteTableItem(
@@ -399,12 +401,7 @@ pub fn convert_write_set_change(change: &WriteSetChange) -> transaction::WriteSe
                         ),
                         handle: write_table_item.handle.to_string(),
                         key: write_table_item.key.to_string(),
-                        data: Some(transaction::WriteTableData {
-                            key: data.key.to_string(),
-                            key_type: data.key_type.clone(),
-                            value: data.value.to_string(),
-                            value_type: data.value_type.clone(),
-                        }),
+                        data,
                     },
                 )),
             }