Skip to content

Commit

Permalink
API Owner test for process_multisig_tx
Browse files Browse the repository at this point in the history
  • Loading branch information
GeneFerneau committed Jul 9, 2021
1 parent d85a451 commit 11eb112
Show file tree
Hide file tree
Showing 18 changed files with 946 additions and 280 deletions.
7 changes: 4 additions & 3 deletions api/src/foreign_rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ pub trait ForeignRpc {
],
"multisig_path": "m/1018305059/3401844484/447546778/208817231",
"sta": "A1",
"ver": "4:2"
"ver": "5:2"
},
null,
null
Expand Down Expand Up @@ -588,9 +588,10 @@ pub fn run_doctest_foreign(

// Spit out slate for input to finalize_tx
println!("LOCKING TX");
api_impl::owner::tx_lock_outputs(&mut **w, (&mask1).as_ref(), &sl).unwrap();
api_impl::owner::tx_lock_outputs(&mut **w, mask1.as_ref(), &sl).unwrap();

sl = api_impl::owner::process_multisig_tx(&mut **w, mask1.as_ref(), &sl).unwrap();
sl =
api_impl::owner::process_multisig_tx(&mut **w, mask1.as_ref(), &sl, false).unwrap();
sl = api_impl::foreign::finalize_tx(&mut **w2, mask2.as_ref(), &sl, false).unwrap();
}

Expand Down
4 changes: 2 additions & 2 deletions api/src/owner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,8 @@ where
) -> Result<Slate, Error> {
let mut w_lock = self.wallet_inst.lock();
let w = w_lock.lc_provider()?.wallet_inst()?;
owner::process_multisig_tx(&mut **w, keychain_mask, slate)
}
owner::process_multisig_tx(&mut **w, keychain_mask, slate, self.doctest_mode)
}

/// Initializes an atomic swap transaction. The transaction can either be
/// the main or refund. To create a refund transaction, set `args.late_lock = Some(true)`.
Expand Down
Loading

0 comments on commit 11eb112

Please sign in to comment.