resolve conflicts

aptos-labs · Sep 18, 2024 · 5ea8cb6 · 5ea8cb6
1 parent b01107b
commit 5ea8cb6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/rust/processor/src/db/common/models/default_models/transactions.rs b/rust/processor/src/db/common/models/default_models/transactions.rs
@@ -103,7 +103,7 @@ impl Transaction {
             .collect();
 
         for processed_txn in processed_txns {
-            let (block_metadata, mut wsc_detail_list) = processed_txns;
+            let (block_metadata, mut wsc_detail_list) = processed_txn;
             if let Some(a) = block_metadata {
                 block_metadata_txns.push(a);
             }

diff --git a/rust/processor/src/processors/default_processor.rs b/rust/processor/src/processors/default_processor.rs
@@ -274,11 +274,7 @@ fn process_transactions(
     flags: TableFlags,
 ) -> (
     Vec<BlockMetadataTransaction>,
-    (
-        Vec<TableItem>,
-        Vec<CurrentTableItem>,
-        Vec<TableMetadata>,
-    ),
+    (Vec<TableItem>, Vec<CurrentTableItem>, Vec<TableMetadata>),
 ) {
     let (block_metadata_txns, wsc_details) = TransactionModel::from_transactions(&transactions);
     let mut block_metadata_transactions = vec![];