fix: rename received_amount to invoice_amount

breez · Mar 21, 2024 · af3280b · af3280b
1 parent 20592c6
commit af3280b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/lib/src/model.rs b/lib/src/model.rs
@@ -106,7 +106,7 @@ pub struct OngoingSwap {
     pub preimage: String,
     pub redeem_script: String,
     pub blinding_key: String,
-    pub requested_amount_sat: u64,
+    pub invoice_amount_sat: u64,
 }
 
 pub enum PaymentType {

diff --git a/lib/src/persist/migrations.rs b/lib/src/persist/migrations.rs
@@ -5,7 +5,7 @@ pub(crate) fn current_migrations() -> Vec<&'static str> {
             preimage TEXT NOT NULL,
             redeem_script TEXT NOT NULL,
             blinding_key TEXT NOT NULL,
-            requested_amount_sat INTEGER NOT NULL
+            invoice_amount_sat INTEGER
         ) STRICT;",
     ]
 }
diff --git a/lib/src/persist/mod.rs b/lib/src/persist/mod.rs
@@ -45,7 +45,7 @@ impl Persister {
                     preimage,
                     redeem_script,
                     blinding_key,
-                    requested_amount_sat
+                    invoice_amount_sat
                 )
                 VALUES (?, ?, ?, ?, ?)
             ",
@@ -57,7 +57,7 @@ impl Persister {
                 &swap.preimage,
                 &swap.redeem_script,
                 &swap.blinding_key,
-                &swap.requested_amount_sat,
+                &swap.invoice_amount_sat,
             ))?
         }
 
@@ -92,7 +92,7 @@ impl Persister {
             preimage: row.get(1)?,
             redeem_script: row.get(2)?,
             blinding_key: row.get(3)?,
-            requested_amount_sat: row.get(4)?,
+            invoice_amount_sat: row.get(4)?,
         })
     }
 }
diff --git a/lib/src/wallet.rs b/lib/src/wallet.rs
@@ -326,7 +326,7 @@ impl Wallet {
                 preimage: preimage.to_string().expect("Expecting valid preimage"),
                 blinding_key: blinding_str,
                 redeem_script,
-                requested_amount_sat: amount_sat,
+                invoice_amount_sat: amount_sat,
             }])
             .map_err(|_| SwapError::PersistError)?;
 
@@ -370,7 +370,7 @@ impl Wallet {
                         id: None,
                         timestamp: None,
                         payment_type: PaymentType::Pending,
-                        amount_sat: swap.requested_amount_sat,
+                        amount_sat: swap.invoice_amount_sat,
                     },
                 );
             }