Rename FFI named parameters to specify units

Author: spacebear21

payjoin-ffi/dart/test/test_payjoin_integration_test.dart

@@ -322,7 +322,7 @@ Future<payjoin.PayjoinProposalReceiveSession> process_unchecked_proposal(
 ) async {
   final unchecked_proposal = proposal
       .checkBroadcastSuitability(
-        minFeeRate: null,
+        minFeeRateSatPerKwu: null,
         canBroadcast: MempoolAcceptanceCallback(receiver),
       )
       .save(persister: recv_persister);
@@ -507,7 +507,7 @@ void main() {
         () => payjoin.SenderBuilder(
           psbt: psbt,
           uri: pjUri,
-        ).buildRecommended(minFeeRate: overflowFeeRate),
+        ).buildRecommended(minFeeRateSatPerKwu: overflowFeeRate),
         throwsA(isA<payjoin.SenderInputException>()),
       );
 
@@ -555,10 +555,10 @@ void main() {
       // Create a funded PSBT (not broadcasted) to address with amount given in the pj_uri
       var pj_uri = session.pjUri();
       var psbt = build_sweep_psbt(sender, pj_uri);
-      payjoin.WithReplyKey req_ctx = payjoin.SenderBuilder(
-        psbt: psbt,
-        uri: pj_uri,
-      ).buildRecommended(minFeeRate: 1000).save(persister: sender_persister);
+      payjoin.WithReplyKey req_ctx =
+          payjoin.SenderBuilder(psbt: psbt, uri: pj_uri)
+              .buildRecommended(minFeeRateSatPerKwu: 1000)
+              .save(persister: sender_persister);
       payjoin.RequestOhttpContext request = req_ctx.createV2PostRequest(
         ohttpRelay: ohttp_relay,
       );

payjoin-ffi/dart/test/test_payjoin_unit_test.dart

@@ -189,10 +189,9 @@ void main() {
 
       var sender_persister = InMemorySenderPersister("1");
       var psbt = payjoin.originalPsbt();
-      payjoin.SenderBuilder(
-        psbt: psbt,
-        uri: uri,
-      ).buildRecommended(minFeeRate: 1000).save(persister: sender_persister);
+      payjoin.SenderBuilder(psbt: psbt, uri: uri)
+          .buildRecommended(minFeeRateSatPerKwu: 1000)
+          .save(persister: sender_persister);
       final senderResult = payjoin.replaySenderEventLog(
         persister: sender_persister,
       );
@@ -274,10 +273,9 @@ void main() {
 
       var sender_persister = InMemorySenderPersister("1");
       var psbt = payjoin.originalPsbt();
-      var withReplyKey = payjoin.SenderBuilder(
-        psbt: psbt,
-        uri: uri,
-      ).buildRecommended(minFeeRate: 1000).save(persister: sender_persister);
+      var withReplyKey = payjoin.SenderBuilder(psbt: psbt, uri: uri)
+          .buildRecommended(minFeeRateSatPerKwu: 1000)
+          .save(persister: sender_persister);
       var cancelTransition = withReplyKey.cancel();
       var fallbackTx = cancelTransition.save(persister: sender_persister);
       expect(fallbackTx, isNotNull);
@@ -308,7 +306,7 @@ void main() {
       var sender_persister = InMemorySenderPersisterAsync("1");
       var psbt = payjoin.originalPsbt();
       var withReplyKey = await payjoin.SenderBuilder(psbt: psbt, uri: uri)
-          .buildRecommended(minFeeRate: 1000)
+          .buildRecommended(minFeeRateSatPerKwu: 1000)
           .saveAsync(persister: sender_persister);
       var cancelTransition = withReplyKey.cancel();
       var fallbackTx = await cancelTransition.saveAsync(
@@ -369,7 +367,7 @@ void main() {
       var sender_persister = InMemorySenderPersisterAsync("1");
       var psbt = payjoin.originalPsbt();
       await payjoin.SenderBuilder(psbt: psbt, uri: uri)
-          .buildRecommended(minFeeRate: 1000)
+          .buildRecommended(minFeeRateSatPerKwu: 1000)
           .saveAsync(persister: sender_persister);
       final senderResult = await payjoin.replaySenderEventLogAsync(
         persister: sender_persister,

payjoin-ffi/src/receive/mod.rs

@@ -493,8 +493,8 @@ impl ReceiverBuilder {
         Ok(Self(self.0.clone().with_amount(amount)))
     }
 
-    pub fn with_expiration(&self, expiration: u64) -> Result<Self, FfiValidationError> {
-        let expiration = validate_expiration_secs(expiration)?;
+    pub fn with_expiration(&self, expiration_secs: u64) -> Result<Self, FfiValidationError> {
+        let expiration = validate_expiration_secs(expiration_secs)?;
         Ok(Self(self.0.clone().with_expiration(expiration)))
     }
 
@@ -715,10 +715,10 @@ pub trait CanBroadcast: Send + Sync {
 impl UncheckedOriginalPayload {
     pub fn check_broadcast_suitability(
         &self,
-        min_fee_rate: Option<u64>,
+        min_fee_rate_sat_per_kwu: Option<u64>,
         can_broadcast: Arc<dyn CanBroadcast>,
     ) -> Result<UncheckedOriginalPayloadTransition, FfiValidationError> {
-        let min_fee_rate = validate_fee_rate_sat_per_kwu_opt(min_fee_rate)?;
+        let min_fee_rate = validate_fee_rate_sat_per_kwu_opt(min_fee_rate_sat_per_kwu)?;
         Ok(UncheckedOriginalPayloadTransition(Arc::new(RwLock::new(Some(
             self.0.clone().check_broadcast_suitability(min_fee_rate, |transaction| {
                 can_broadcast

payjoin-ffi/src/send/mod.rs

@@ -371,9 +371,9 @@ impl SenderBuilder {
     // This method fails if no recommendation can be made or if the PSBT is malformed.
     pub fn build_recommended(
         &self,
-        min_fee_rate: u64,
+        min_fee_rate_sat_per_kwu: u64,
     ) -> Result<InitialSendTransition, SenderInputError> {
-        let fee_rate = validate_fee_rate_sat_per_kwu(min_fee_rate)?;
+        let fee_rate = validate_fee_rate_sat_per_kwu(min_fee_rate_sat_per_kwu)?;
         self.0
             .clone()
             .build_recommended(fee_rate)
@@ -384,7 +384,7 @@ impl SenderBuilder {
     }
     /// Offer the receiver contribution to pay for his input.
     ///
-    /// These parameters will allow the receiver to take `max_fee_contribution` from given change
+    /// These parameters will allow the receiver to take `max_fee_contribution_sats` from given change
     /// output to pay for additional inputs. The recommended fee is `size_of_one_input * fee_rate`.
     ///
     /// `change_index` specifies which output can be used to pay fee. If `None` is provided, then
@@ -397,13 +397,13 @@ impl SenderBuilder {
     /// be just lowered in the request to match the change amount.
     pub fn build_with_additional_fee(
         &self,
-        max_fee_contribution: u64,
+        max_fee_contribution_sats: u64,
         change_index: Option<u8>,
-        min_fee_rate: u64,
+        min_fee_rate_sat_per_kwu: u64,
         clamp_fee_contribution: bool,
     ) -> Result<InitialSendTransition, SenderInputError> {
-        let max_fee_contribution = validate_amount_sat(max_fee_contribution)?;
-        let fee_rate = validate_fee_rate_sat_per_kwu(min_fee_rate)?;
+        let max_fee_contribution = validate_amount_sat(max_fee_contribution_sats)?;
+        let fee_rate = validate_fee_rate_sat_per_kwu(min_fee_rate_sat_per_kwu)?;
         self.0
             .clone()
             .build_with_additional_fee(
@@ -423,9 +423,9 @@ impl SenderBuilder {
     /// This function disables contribution.
     pub fn build_non_incentivizing(
         &self,
-        min_fee_rate: u64,
+        min_fee_rate_sat_per_kwu: u64,
     ) -> Result<InitialSendTransition, SenderInputError> {
-        let fee_rate = validate_fee_rate_sat_per_kwu(min_fee_rate)?;
+        let fee_rate = validate_fee_rate_sat_per_kwu(min_fee_rate_sat_per_kwu)?;
         self.0
             .clone()
             .build_non_incentivizing(fee_rate)