refactor: remove fake failure mode from function

maidsafe · Dec 5, 2023 · 124960c · 124960c
1 parent 63a9563
commit 124960c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/sn_node/src/node.rs b/sn_node/src/node.rs
@@ -475,7 +475,9 @@ impl Node {
                         .map_err(|_| ProtocolError::GetStoreCostFailed);
 
                     QueryResponse::GetStoreCost {
-                        quote: Self::create_quote_for_storecost(network, store_cost, &address),
+                        quote: store_cost.and_then(|cost| {
+                            Self::create_quote_for_storecost(network, cost, &address)
+                        }),
                         payment_address,
                     }
                 }

diff --git a/sn_node/src/quote.rs b/sn_node/src/quote.rs
@@ -17,17 +17,15 @@ const QUOTE_EXPIRATION_SECS: u64 = 3600;
 impl Node {
     pub(crate) fn create_quote_for_storecost(
         network: &Network,
-        store_cost: Result<NanoTokens, ProtocolError>,
+        cost: NanoTokens,
         address: &NetworkAddress,
     ) -> Result<PaymentQuote, ProtocolError> {
-        let cost = store_cost?;
         let content = address.as_xorname().unwrap_or_default();
         let timestamp = std::time::SystemTime::now();
         let bytes = PaymentQuote::bytes_for_signing(content, cost, timestamp);
 
-        let signature = match network.sign(&bytes) {
-            Ok(s) => s,
-            Err(_) => return Err(ProtocolError::QuoteGenerationFailed),
+        let Ok(signature) = network.sign(&bytes) else {
+            return Err(ProtocolError::QuoteGenerationFailed);
         };
 
         let quote = PaymentQuote {