Revert "[CONTRACTS] Contracts branch update for 1.80 (#718)"

This reverts commit cdd63fb565.

controller/tests/common/mod.rs

@@ -15,24 +15,18 @@
 extern crate grin_wallet_controller as wallet;
 extern crate grin_wallet_impls as impls;
 extern crate grin_wallet_libwallet as libwallet;
-extern crate log;
 
-use grin_chain as chain;
 use grin_core as core;
 use grin_keychain as keychain;
 use grin_util as util;
 
 use self::core::global;
 use self::core::global::ChainTypes;
-use self::keychain::{ExtKeychain, Keychain};
+use self::keychain::ExtKeychain;
 use self::libwallet::WalletInst;
-use chain::Chain;
-use grin_wallet_controller::Error;
-use impls::test_framework::{self, LocalWalletClient, WalletProxy};
+use impls::test_framework::{LocalWalletClient, WalletProxy};
 use impls::{DefaultLCProvider, DefaultWalletImpl};
-use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
-use std::thread;
 use util::secp::key::SecretKey;
 use util::{Mutex, ZeroingString};
 
@@ -182,133 +176,3 @@ pub fn open_local_wallet(
 		.unwrap();
 	(Arc::new(Mutex::new(wallet)), mask)
 }
-
-// Creates the given number of wallets and spawns a thread that runs the wallet proxy
-#[allow(dead_code)]
-pub fn create_wallets(
-	wallets_def: Vec<Vec<(&'static str, u64)>>, // a vector of boolean that represent whether we mine into a wallet
-	test_dir: &'static str,
-) -> Result<
-	(
-		Vec<(
-			Arc<
-				Mutex<
-					Box<
-						dyn WalletInst<
-							'static,
-							DefaultLCProvider<'static, LocalWalletClient, ExtKeychain>,
-							LocalWalletClient,
-							ExtKeychain,
-						>,
-					>,
-				>,
-			>,
-			Option<SecretKey>,
-		)>, // wallets
-		Arc<Chain>,      // chain
-		Arc<AtomicBool>, // stopper
-		u64,             //	block height
-	),
-	Error,
-> {
-	// Create a new proxy to simulate server and wallet responses
-	let mut wallet_proxy = create_wallet_proxy(test_dir);
-	let chain = wallet_proxy.chain.clone();
-	let stopper = wallet_proxy.running.clone();
-
-	let mut wallets = vec![];
-	for i in 0..wallets_def.len() {
-		let name = format!("wallet{}", i + 1);
-		let wclient = LocalWalletClient::new(&name, wallet_proxy.tx.clone());
-		let (wallet1, mask1) = create_local_wallet(
-			test_dir,
-			&name,
-			None,
-			// $seed_phrase.clone(),
-			wclient.clone(),
-			true,
-		);
-		wallet_proxy.add_wallet(
-			&name,
-			wclient.get_send_instance(),
-			wallet1.clone(),
-			mask1.clone(),
-		);
-		wallets.push((wallet1, mask1));
-	}
-	// Set the wallet proxy listener running
-	thread::spawn(move || {
-		if let Err(e) = wallet_proxy.run() {
-			log::error!("Wallet Proxy error: {}", e);
-		}
-	});
-
-	// // Mine values into wallets
-	// // few values to keep things shorter
-	let reward = core::consensus::REWARD;
-	let mut bh = 0u64;
-
-	for (idx, accs) in wallets_def.iter().enumerate() {
-		let wallet1 = wallets[idx].0.clone();
-		let mask1 = wallets[idx].1.as_ref();
-
-		for (acc_idx, (acc_name, num_mined_blocks)) in accs.iter().enumerate() {
-			// create the account
-			if acc_name.to_string() != "default" {
-				wallet::controller::owner_single_use(
-					Some(wallet1.clone()),
-					mask1,
-					None,
-					|api, m| {
-						let new_path = api.create_account_path(m, acc_name)?;
-						assert_eq!(
-							new_path,
-							ExtKeychain::derive_key_id(2, acc_idx as u32, 0, 0, 0) // NOTE: default should always be at 0 and is already created
-						);
-						Ok(())
-					},
-				)?;
-			}
-
-			// Get some mining done
-			if *num_mined_blocks == 0 {
-				continue;
-			}
-			{
-				wallet_inst!(wallet1, w);
-				w.set_parent_key_id_by_name(acc_name)?;
-			}
-			let _ = test_framework::award_blocks_to_wallet(
-				&chain,
-				wallet1.clone(),
-				mask1,
-				*num_mined_blocks as usize,
-				false,
-			);
-			bh += num_mined_blocks;
-
-			// Sanity check wallet 1 contents
-			wallet::controller::owner_single_use(Some(wallet1.clone()), mask1, None, |api, m| {
-				let (wallet1_refreshed, wallet1_info) = api.retrieve_summary_info(m, true, 1)?;
-				assert!(wallet1_refreshed);
-				assert_eq!(wallet1_info.last_confirmed_height, bh);
-				assert_eq!(wallet1_info.total, num_mined_blocks * reward);
-				Ok(())
-			})?;
-		}
-
-		// Sanity check the number of accounts
-		wallet::controller::owner_single_use(Some(wallet1.clone()), mask1, None, |api, m| {
-			let accounts = api.accounts(m)?;
-			assert_eq!(accounts.len(), accs.len());
-			Ok(())
-		})?;
-		// Set the account on the wallet to "default"
-		{
-			wallet_inst!(wallet1, w);
-			w.set_parent_key_id_by_name("default")?;
-		}
-	}
-
-	Ok((wallets, chain, stopper, bh))
-}