fix: rebase main

Signed-off-by: Gustavo Inacio <[email protected]>
semiotic-ai · Mar 4, 2024 · 6f5c821 · 6f5c821
1 parent 7cf2ed0
commit 6f5c821
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/tap_aggregator/src/server.rs b/tap_aggregator/src/server.rs
@@ -160,7 +160,6 @@ fn aggregate_receipts_(
                 wallet,
                 accepted_addresses,
             )
-            .await
         }
     };
 

diff --git a/tap_core/src/tap_manager/manager.rs b/tap_core/src/tap_manager/manager.rs
@@ -93,7 +93,7 @@ where
         }
 
         self.timestamp_check
-            .update_min_timestamp_ns(expected_rav.timestamp_ns)
+            .update_min_timestamp_ns(expected_rav.timestampNs)
             .await;
 
         self.executor
@@ -104,7 +104,7 @@ where
             })?;
 
         self.timestamp_check
-            .update_min_timestamp_ns(expected_rav.timestamp_ns)
+            .update_min_timestamp_ns(expected_rav.timestampNs)
             .await;
 
         Ok(())

diff --git a/tap_integration_tests/tests/showcase.rs b/tap_integration_tests/tests/showcase.rs
@@ -34,7 +34,7 @@ use tap_core::{
     eip_712_signed_message::EIP712SignedMessage,
     tap_eip712_domain,
     tap_manager::SignedRAV,
-    tap_receipt::{Receipt, ReceiptCheck, ReceivedReceipt},
+    tap_receipt::{Receipt, ReceivedReceipt},
 };
 
 use crate::indexer_mock;
-Original file line number
+Diff line change
@@ Expand Up / @@ -160,7 +160,6 @@ fn aggregate_receipts_( @@
                     wallet,
                     accepted_addresses,
                 )
-                .await
             }
         };
@@ Expand Down @@