Fixes to grin wallet repost, cancel tx (#2029)

* fixes to wallet cancel, repost, ensure stored transaction is updated with final signatures * rustfmt * add tests for reposting * fixes to tests * repost
2018-11-27 13:36:49 +00:00
parent 79d540cf86
commit b95caecc27
9 changed files with 314 additions and 23 deletions
@@ -453,11 +453,12 @@ pub fn wallet_command(wallet_args: &ArgMatches, config: GlobalWalletConfig) -> i
 							Ok(())
 						})?;
 					}
+					api.tx_lock_outputs(&slate, lock_fn)?;
 					api.finalize_tx(&mut slate)?;
 				} else {
 					adapter.send_tx_async(dest, &slate)?;
+					api.tx_lock_outputs(&slate, lock_fn)?;
 				}
-				api.tx_lock_outputs(&slate, lock_fn)?;
 				if adapter.supports_sync() {
 					let result = api.post_tx(&slate, fluff);
 					match result {