c40e8a915b
* version bump for next potential release * Merge master into milestone/2.1.0 (#182) * Derive --version output dynamically from cargo package version (#174) * add --txid to the `wallet txs` command (#176) * add --txid to the `wallet txs` command * add test for `wallet txs` command with `--txid` parameter * Refactor - Split WalletCommAdapter into multiple traits (#180) * Derive --version output dynamically from cargo package version (#174) * add server auth argument to http client * Revert "add server auth argument to http client" This reverts commit f52a8d2c7cdfb8583af5716ad621eb560811d6ee. * modify WalletCommAdapter, moving dest argument into fields on implementors, visiting havok on automated tests, at least one of which is now out of date and failing * Split WalletCommAdapter into four traits, one for each of its intended behaviors. * Remove two vestigals 1. args, a stringly typed argument to put_tx 2. NullAdapter, which is no longer used * Remove unused "params" argument from listen method. * Re-add previously existing TODO comment * Fix non-test build * completely Fix non-test build * Full Lifecycle API Support (#184) * refactoring wallet lib traits * rustfmt * rustfmt * add new files * explicit lifetime specifiers on all wallet traits * rustfmt * modify apis to use new walletinst * rustfmt * converting controller crate * rustfmt * controller crate compiling * rustfmt * compilation * rustfmt * Remove config from wallet, implement open_wallet, close_wallet in lifecycle provider, remove password + open_with_credentials from WalletBackend + impl * rustfmt * full compilation, changing recovery + init to new model * rustfmt * wallet initialisation working, init command output and flow identical to v2.0.0 wallet * rustfmt * fix listener and owner api startup * rustfmt * rustfmt * move encryption test * rustfmt * fix api doctests * rustfmt * fix for most tests in controller crate * rustfmt * fix for check tests in controller crate * fix main wallet tests * rustfmt * add explicit functions to handle mnemonic recovery, fix CLI recovery workflow * rustfmt * update keybase adapter to use new wallet format * rustfmt * test fix * remove debug output
139 lines
4.0 KiB
Rust
139 lines
4.0 KiB
Rust
// Copyright 2019 The Grin Developers
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! common functions for tests (instantiating wallet and proxy, mostly)
|
|
extern crate grin_wallet_controller as wallet;
|
|
extern crate grin_wallet_impls as impls;
|
|
extern crate grin_wallet_libwallet as libwallet;
|
|
|
|
use grin_wallet_util::grin_core as core;
|
|
use grin_wallet_util::grin_keychain as keychain;
|
|
use grin_wallet_util::grin_util as util;
|
|
|
|
use self::core::global;
|
|
use self::core::global::ChainTypes;
|
|
use self::keychain::ExtKeychain;
|
|
use self::libwallet::WalletInst;
|
|
use impls::test_framework::{LocalWalletClient, WalletProxy};
|
|
use impls::{DefaultLCProvider, DefaultWalletImpl};
|
|
use std::fs;
|
|
use std::sync::Arc;
|
|
use util::{Mutex, ZeroingString};
|
|
|
|
#[macro_export]
|
|
macro_rules! wallet_inst {
|
|
($wallet:ident, $w: ident) => {
|
|
let mut w_lock = $wallet.lock();
|
|
let lc = w_lock.lc_provider()?;
|
|
let $w = lc.wallet_inst()?;
|
|
};
|
|
}
|
|
|
|
#[macro_export]
|
|
macro_rules! create_wallet_and_add {
|
|
($client:ident, $wallet: ident, $test_dir: expr, $name: expr, $seed_phrase: expr, $proxy: expr) => {
|
|
let $client = LocalWalletClient::new($name, $proxy.tx.clone());
|
|
let $wallet =
|
|
common::create_local_wallet($test_dir, $name, $seed_phrase.clone(), $client.clone());
|
|
$proxy.add_wallet($name, $client.get_send_instance(), $wallet.clone());
|
|
};
|
|
}
|
|
|
|
#[macro_export]
|
|
macro_rules! open_wallet_and_add {
|
|
($client:ident, $wallet: ident, $test_dir: expr, $name: expr, $proxy: expr) => {
|
|
let $client = LocalWalletClient::new($name, $proxy.tx.clone());
|
|
let $wallet = common::open_local_wallet($test_dir, $name, $client.clone());
|
|
$proxy.add_wallet($name, $client.get_send_instance(), $wallet.clone());
|
|
};
|
|
}
|
|
pub fn clean_output_dir(test_dir: &str) {
|
|
let _ = fs::remove_dir_all(test_dir);
|
|
}
|
|
|
|
pub fn setup(test_dir: &str) {
|
|
util::init_test_logger();
|
|
clean_output_dir(test_dir);
|
|
global::set_mining_mode(ChainTypes::AutomatedTesting);
|
|
}
|
|
|
|
pub fn create_wallet_proxy(
|
|
test_dir: &str,
|
|
) -> WalletProxy<DefaultLCProvider<LocalWalletClient, ExtKeychain>, LocalWalletClient, ExtKeychain>
|
|
{
|
|
WalletProxy::new(test_dir)
|
|
}
|
|
|
|
pub fn create_local_wallet(
|
|
test_dir: &str,
|
|
name: &str,
|
|
mnemonic: Option<ZeroingString>,
|
|
client: LocalWalletClient,
|
|
) -> Arc<
|
|
Mutex<
|
|
Box<
|
|
WalletInst<
|
|
'static,
|
|
DefaultLCProvider<'static, LocalWalletClient, ExtKeychain>,
|
|
LocalWalletClient,
|
|
ExtKeychain,
|
|
>,
|
|
>,
|
|
>,
|
|
> {
|
|
let mut wallet = Box::new(DefaultWalletImpl::<LocalWalletClient>::new(client).unwrap())
|
|
as Box<
|
|
WalletInst<
|
|
DefaultLCProvider<'static, LocalWalletClient, ExtKeychain>,
|
|
LocalWalletClient,
|
|
ExtKeychain,
|
|
>,
|
|
>;
|
|
let lc = wallet.lc_provider().unwrap();
|
|
lc.set_wallet_directory(&format!("{}/{}", test_dir, name));
|
|
lc.create_wallet(None, mnemonic, 32, ZeroingString::from(""))
|
|
.unwrap();
|
|
lc.open_wallet(None, ZeroingString::from("")).unwrap();
|
|
Arc::new(Mutex::new(wallet))
|
|
}
|
|
|
|
pub fn open_local_wallet(
|
|
test_dir: &str,
|
|
name: &str,
|
|
client: LocalWalletClient,
|
|
) -> Arc<
|
|
Mutex<
|
|
Box<
|
|
WalletInst<
|
|
'static,
|
|
DefaultLCProvider<'static, LocalWalletClient, ExtKeychain>,
|
|
LocalWalletClient,
|
|
ExtKeychain,
|
|
>,
|
|
>,
|
|
>,
|
|
> {
|
|
let mut wallet = Box::new(DefaultWalletImpl::<LocalWalletClient>::new(client).unwrap())
|
|
as Box<
|
|
WalletInst<
|
|
DefaultLCProvider<'static, LocalWalletClient, ExtKeychain>,
|
|
LocalWalletClient,
|
|
ExtKeychain,
|
|
>,
|
|
>;
|
|
let lc = wallet.lc_provider().unwrap();
|
|
lc.set_wallet_directory(&format!("{}/{}", test_dir, name));
|
|
lc.open_wallet(None, ZeroingString::from("")).unwrap();
|
|
Arc::new(Mutex::new(wallet))
|
|
}
|