[WIP] V2 API Doctest generation (#24)

V2 API Doctest generation

integration/tests/framework.rs

@@ -28,11 +28,11 @@ use grin_keychain as keychain;
 use grin_p2p as p2p;
 use grin_servers as servers;
 use grin_util as util;
+use p2p::PeerAddr;
 use std::default::Default;
 use std::ops::Deref;
 use std::sync::Arc;
 use std::{fs, thread, time};
-use p2p::PeerAddr;
 
 /// Just removes all results from previous runs
 pub fn clean_all_output(test_name_dir: &str) {
@@ -197,7 +197,9 @@ impl LocalServerContainer {
 
 		if self.config.seed_addr.len() > 0 {
 			seeding_type = p2p::Seeding::List;
-			seeds = vec![PeerAddr::from_ip(self.config.seed_addr.to_string().parse().unwrap())];
+			seeds = vec![PeerAddr::from_ip(
+				self.config.seed_addr.to_string().parse().unwrap(),
+			)];
 		}
 
 		let s = servers::Server::new(servers::ServerConfig {
@@ -357,8 +359,7 @@ impl LocalServerContainer {
 			.unwrap_or_else(|e| panic!("Error creating wallet: {:?} Config: {:?}", e, config));
 		wallet.keychain = Some(keychain);
 		let parent_id = keychain::ExtKeychain::derive_key_id(2, 0, 0, 0, 0);
-		let _ =
-			libwallet::internal::updater::refresh_outputs(&mut wallet, &parent_id, false);
+		let _ = libwallet::internal::updater::refresh_outputs(&mut wallet, &parent_id, false);
 		libwallet::internal::updater::retrieve_info(&mut wallet, &parent_id, 1).unwrap()
 	}
 
@@ -401,7 +402,7 @@ impl LocalServerContainer {
 				None,
 			)?;
 			slate = client_w.send_tx_sync(dest, &slate)?;
-			api.finalize_tx(&mut slate)?;
+			slate = api.finalize_tx(&slate)?;
 			api.tx_lock_outputs(&slate, lock_fn)?;
 			println!(
 				"Tx sent: {} grin to {} (strategy '{}')",
@@ -655,7 +656,9 @@ pub fn config(n: u16, test_name_dir: &str, seed_n: u16) -> servers::ServerConfig
 		p2p_config: p2p::P2PConfig {
 			port: 10000 + n,
 			seeding_type: p2p::Seeding::List,
-			seeds: Some(vec![PeerAddr::from_ip(format!("127.0.0.1:{}", 10000 + seed_n).parse().unwrap())]),
+			seeds: Some(vec![PeerAddr::from_ip(
+				format!("127.0.0.1:{}", 10000 + seed_n).parse().unwrap(),
+			)]),
 			..p2p::P2PConfig::default()
 		},
 		chain_type: core::global::ChainTypes::AutomatedTesting,

integration/tests/simulnet.rs

@@ -35,12 +35,12 @@ use grin_keychain as keychain;
 use grin_p2p as p2p;
 use grin_servers as servers;
 use grin_util as util;
+use p2p::PeerAddr;
 use std::cmp;
 use std::default::Default;
 use std::process::exit;
 use std::sync::Arc;
 use std::{thread, time};
-use p2p::PeerAddr;
 
 use crate::framework::{
 	config, stop_all_servers, LocalServerContainerConfig, LocalServerContainerPool,
@@ -948,7 +948,8 @@ fn replicate_tx_fluff_failure() {
 	for i in 0..dl_nodes {
 		// (create some stem nodes)
 		let mut s_config = framework::config(3002 + i, "tx_fluff", 3002 + i);
-		s_config.p2p_config.seeds = Some(vec![PeerAddr::from_ip("127.0.0.1:13000".parse().unwrap())]);
+		s_config.p2p_config.seeds =
+			Some(vec![PeerAddr::from_ip("127.0.0.1:13000".parse().unwrap())]);
 		s_config.dandelion_config.embargo_secs = Some(10);
 		s_config.dandelion_config.patience_secs = Some(1);
 		s_config.dandelion_config.relay_secs = Some(1);
@@ -973,7 +974,7 @@ fn replicate_tx_fluff_failure() {
 			None,
 		)?;
 		slate = client1_w.send_tx_sync(dest, &slate)?;
-		api.finalize_tx(&mut slate)?;
+		slate = api.finalize_tx(&slate)?;
 		api.tx_lock_outputs(&slate, lock_fn)?;
 		api.post_tx(&slate.tx, false)?;
 		Ok(())