fix: include unpaid store quotes in receipt

autonomi/src/client/payment.rs

@@ -1,17 +1,14 @@
 use crate::client::data::PayError;
 use crate::client::quote::StoreQuote;
 use crate::Client;
-use ant_evm::{AttoTokens, EncodedPeerId, EvmWallet, ProofOfPayment, QuoteHash, TxHash};
-use std::collections::{BTreeMap, HashMap};
+use ant_evm::{AttoTokens, EncodedPeerId, EvmWallet, ProofOfPayment};
+use std::collections::HashMap;
 use xor_name::XorName;
 
 /// Contains the proof of payments for each XOR address and the amount paid
 pub type Receipt = HashMap<XorName, (ProofOfPayment, AttoTokens)>;
 
-pub fn receipt_from_store_quotes_and_payments(
-    quotes: StoreQuote,
-    payments: BTreeMap<QuoteHash, TxHash>,
-) -> Receipt {
+pub fn receipt_from_store_quotes(quotes: StoreQuote) -> Receipt {
     let mut receipt = Receipt::new();
 
     for (content_addr, quote_for_address) in quotes.0 {
@@ -22,11 +19,6 @@ pub fn receipt_from_store_quotes_and_payments(
         };
 
         for (peer_id, quote, _amount) in quote_for_address.0 {
-            // skip quotes that haven't been paid
-            if !payments.contains_key(&quote.hash()) {
-                continue;
-            }
-
             proof_of_payment
                 .peer_quotes
                 .push((EncodedPeerId::from(peer_id), quote));

autonomi/src/client/utils.rs

@@ -6,7 +6,7 @@
 // KIND, either express or implied. Please review the Licences for the specific language governing
 // permissions and limitations relating to use of the SAFE Network Software.
 
-use crate::client::payment::{receipt_from_store_quotes_and_payments, Receipt};
+use crate::client::payment::{receipt_from_store_quotes, Receipt};
 use ant_evm::{EvmWallet, ProofOfPayment};
 use ant_networking::{GetRecordCfg, PutRecordCfg, VerificationKind};
 use ant_protocol::{
@@ -174,7 +174,7 @@ impl Client {
         // TODO: the error might contain some succeeded quote payments as well. These should be returned on err, so that they can be skipped when retrying.
         // TODO: retry when it fails?
         // Execute chunk payments
-        let payments = wallet
+        let _payments = wallet
             .pay_for_quotes(quotes.payments())
             .await
             .map_err(|err| PayError::from(err.0))?;
@@ -190,7 +190,7 @@ impl Client {
             skipped_chunks
         );
 
-        let receipt = receipt_from_store_quotes_and_payments(quotes, payments);
+        let receipt = receipt_from_store_quotes(quotes);
 
         Ok(receipt)
     }