Merge pull request #242 from freedomlayer/real/feat/reduced-commit

Reduce MultiCommit into Commit

.travis.yml

@@ -49,8 +49,9 @@ matrix:
     os: osx
     rust: none
     osx_image: xcode9.4.1
+    # Solution due to https://travis-ci.community/t/homebrew-syntax-error/5623 :
     before_script:
-    - brew install capnp
+    - HOMEBREW_NO_AUTO_UPDATE=1 brew install capnp
     script:
     - cargo test
 

components/app/src/app_conn/buyer.rs

@@ -107,7 +107,8 @@ where
         route: FriendsRoute,
         dest_payment: u128,
         fees: u128,
-    ) -> Result<Commit, BuyerError> {
+        // TODO: Possibly use a new type instead of `Option<Commit>` ?
+    ) -> Result<Option<Commit>, BuyerError> {
         let create_transaction = CreateTransaction {
             payment_id,
             request_id: request_id.clone(),
@@ -138,7 +139,8 @@ where
                 continue;
             }
             match transaction_result.result {
-                RequestResult::Success(commit) => return Ok(commit),
+                RequestResult::Complete(commit) => return Ok(Some(commit)),
+                RequestResult::Success => return Ok(None),
                 RequestResult::Failure => return Err(BuyerError::NodeError),
             }
         }

components/app/src/app_conn/seller.rs

@@ -7,7 +7,7 @@ use proto::crypto::{InvoiceId, Uid};
 use crypto::rand::{CryptoRandom, OffstSystemRandom, RandGen};
 
 use proto::app_server::messages::{AppRequest, AppToAppServer};
-use proto::funder::messages::{AddInvoice, Currency, MultiCommit};
+use proto::funder::messages::{AddInvoice, Commit, Currency};
 
 // TODO: Different in naming convention from AppConfigError and AppRoutesError:
 #[derive(Debug)]
@@ -114,12 +114,10 @@ where
         Err(SellerError::NoResponse)
     }
 
-    pub async fn commit_invoice(&mut self, multi_commit: MultiCommit) -> Result<(), SellerError> {
+    pub async fn commit_invoice(&mut self, commit: Commit) -> Result<(), SellerError> {
         let app_request_id = Uid::rand_gen(&self.rng);
-        let to_app_server = AppToAppServer::new(
-            app_request_id.clone(),
-            AppRequest::CommitInvoice(multi_commit),
-        );
+        let to_app_server =
+            AppToAppServer::new(app_request_id.clone(), AppRequest::CommitInvoice(commit));
 
         // Start listening to done requests:
         let mut incoming_done_requests = self

components/app/src/lib.rs

@@ -24,8 +24,8 @@ pub use proto::ser_string;
 
 pub use proto::app_server::messages::{AppPermissions, NamedRelayAddress, RelayAddress};
 pub use proto::funder::messages::{
-    BalanceInfo, Commit, CountersInfo, Currency, CurrencyBalanceInfo, McInfo, MultiCommit,
-    PaymentStatus, PaymentStatusSuccess, Rate, Receipt, TokenInfo,
+    BalanceInfo, Commit, CountersInfo, Currency, CurrencyBalanceInfo, McInfo, PaymentStatus,
+    PaymentStatusSuccess, Rate, Receipt, TokenInfo,
 };
 pub use proto::index_server::messages::NamedIndexServerAddress;
 

components/funder/src/handler/canceler.rs

@@ -14,7 +14,7 @@ use crate::handler::types::SendCommands;
 use crate::handler::utils::find_request_origin;
 
 use crate::friend::{BackwardsOp, ChannelStatus, FriendMutation};
-use crate::state::{FunderMutation, Payment};
+use crate::state::{FunderMutation, Payment, PaymentStage};
 use crate::types::{create_cancel_send_funds, create_pending_transaction};
 
 #[derive(Debug)]
@@ -72,47 +72,56 @@ where
     let funder_mutation = FunderMutation::RemoveTransaction(request_id.clone());
     m_state.mutate(funder_mutation);
 
+    let Payment {
+        src_plain_lock,
+        stage,
+    } = payment;
+
     // Update payment:
     // - Decrease num_transactions
     // - Possibly remove payment
-    let opt_new_payment = match payment {
-        Payment::NewTransactions(new_transactions) => {
+    let opt_new_stage = match stage {
+        PaymentStage::NewTransactions(new_transactions) => {
             let mut new_new_transactions = new_transactions.clone();
             new_new_transactions.num_transactions =
                 new_transactions.num_transactions.checked_sub(1).unwrap();
-            Some(Payment::NewTransactions(new_new_transactions))
+            Some(PaymentStage::NewTransactions(new_new_transactions))
         }
-        Payment::InProgress(num_transactions) => {
+        PaymentStage::InProgress(num_transactions) => {
             let new_num_transactions = num_transactions.checked_sub(1).unwrap();
             if new_num_transactions > 0 {
-                Some(Payment::InProgress(new_num_transactions))
+                Some(PaymentStage::InProgress(new_num_transactions))
             } else {
                 let ack_uid = Uid::rand_gen(rng);
-                Some(Payment::Canceled(ack_uid))
+                Some(PaymentStage::Canceled(ack_uid))
             }
         }
-        Payment::Success((num_transactions, receipt, request_id)) => {
+        PaymentStage::Success((num_transactions, receipt, request_id)) => {
             let new_num_transactions = num_transactions.checked_sub(1).unwrap();
-            Some(Payment::Success((
+            Some(PaymentStage::Success((
                 new_num_transactions,
                 receipt.clone(),
                 request_id,
             )))
         }
-        Payment::Canceled(_) => {
+        PaymentStage::Canceled(_) => {
             unreachable!();
         }
-        Payment::AfterSuccessAck(num_transactions) => {
+        PaymentStage::AfterSuccessAck(num_transactions) => {
             let new_num_transactions = num_transactions.checked_sub(1).unwrap();
             if new_num_transactions > 0 {
-                Some(Payment::AfterSuccessAck(new_num_transactions))
+                Some(PaymentStage::AfterSuccessAck(new_num_transactions))
             } else {
                 None
             }
         }
     };
 
-    let funder_mutation = if let Some(new_payment) = opt_new_payment {
+    let funder_mutation = if let Some(new_stage) = opt_new_stage {
+        let new_payment = Payment {
+            src_plain_lock,
+            stage: new_stage,
+        };
         FunderMutation::UpdatePayment((open_transaction.payment_id, new_payment))
     } else {
         FunderMutation::RemovePayment(open_transaction.payment_id)