WIP

Signed-off-by: Alexis Asseman <[email protected]>
graphprotocol · Oct 24, 2023 · 1d8f73e · 1d8f73e
1 parent b12ddb0
commit 1d8f73e
Show file tree

Hide file tree

Showing 12 changed files with 522 additions and 183 deletions.
diff --git a/...270c3db62668e2df5a2b7e7a2fac0ef69405.json → ...f5b1ce3c8594b3657436a6cd68d683ef8190.json b/...270c3db62668e2df5a2b7e7a2fac0ef69405.json → ...f5b1ce3c8594b3657436a6cd68d683ef8190.json
diff --git a/.sqlx/query-0e46530ba12da19cedaebaab66bddcfb586bc049fa2d61740c400ae64d33d3b8.json b/.sqlx/query-0e46530ba12da19cedaebaab66bddcfb586bc049fa2d61740c400ae64d33d3b8.json
diff --git a/.sqlx/query-26e4dda54e43d15e3c747982c6c021befec9a5efd2f9d39078d9b45f79c1f31a.json b/.sqlx/query-26e4dda54e43d15e3c747982c6c021befec9a5efd2f9d39078d9b45f79c1f31a.json
diff --git a/.sqlx/query-349bb2ab33307fc52d25d74c8fe736dbfc396116aa2a93bb379029672701cef8.json b/.sqlx/query-349bb2ab33307fc52d25d74c8fe736dbfc396116aa2a93bb379029672701cef8.json
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tap_agent/Cargo.toml b/tap_agent/Cargo.toml
@@ -49,3 +49,4 @@ faux = "0.1.10"
 indexer-common = { path = "../common", features = ["mock"] }
 rstest = "0.18.1"
 tempfile = "3.8.0"
+wiremock = "0.5.19"
diff --git a/tap_agent/src/config.rs b/tap_agent/src/config.rs
@@ -35,7 +35,7 @@ pub struct Cli {
         env = "CONFIG",
         help = "Indexer service configuration file (YAML format)"
     )]
-    config: Option<String>,
+    pub config: Option<String>,
 }
 
 #[derive(Clone, Debug, Args, Serialize, Deserialize, Default)]

diff --git a/tap_agent/src/tap/escrow_adapter.rs b/tap_agent/src/tap/escrow_adapter.rs
@@ -60,34 +60,21 @@ impl EscrowAdapterTrait for EscrowAdapter {
             )
             .to_string(),
         })?;
+
         let fees = self
             .sender_pending_fees
             .read()
             .await
             .get(&sender)
             .copied()
-            .ok_or(AdapterError::AdapterError {
-                error: format!(
-                    "Gateway {} not found in pending fees map, could not get available escrow.",
-                    sender
-                )
-                .to_string(),
-            })?;
+            .unwrap_or(0);
         Ok(balance - fees)
     }
 
     async fn subtract_escrow(&self, sender: Address, value: u128) -> Result<(), AdapterError> {
         let current_available_escrow = self.get_available_escrow(sender).await?;
         let mut fees_write = self.sender_pending_fees.write().await;
-        let fees = fees_write
-            .get_mut(&sender)
-            .ok_or(AdapterError::AdapterError {
-                error: format!(
-                "Gateway {} not found in pending fees map, could not subtract available escrow.",
-                sender
-            )
-                .to_string(),
-            })?;
+        let fees = fees_write.entry(sender).or_insert(0);
         if current_available_escrow < value {
             return Err(AdapterError::AdapterError {
                 error: format!(