Merge branch 'sander/fix/master-dont-resume-cancelled-requests' into …

…'master' fix(backport): don't try to execute cancelled requests on startup See merge request interlay/polkabtc-clients!168
interlay · Jan 15, 2021 · 4645e89 · 4645e89
2 parents c31e447 + 848908e
commit 4645e89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/vault/src/execution.rs b/vault/src/execution.rs
@@ -190,13 +190,13 @@ pub async fn execute_open_requests<B: BitcoinCoreApi + Send + Sync + 'static>(
         .get_vault_redeem_requests(vault_id.clone())
         .await?
         .into_iter()
-        .filter(|(_, request)| !request.completed)
+        .filter(|(_, request)| !request.completed && !request.cancelled)
         .map(|(hash, request)| Request::from_redeem_request(hash, request));
     let open_replaces = provider
         .get_old_vault_replace_requests(vault_id)
         .await?
         .into_iter()
-        .filter(|(_, request)| !request.completed)
+        .filter(|(_, request)| !request.completed && !request.cancelled)
         .map(|(hash, request)| Request::from_replace_request(hash, request));
 
     // Place all redeems&replaces into a hashmap, indexed by their redeemid/replaceid