2019-02-13 18:05:19 +03:00
|
|
|
// Copyright 2018 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.
|
|
|
|
|
|
|
|
//! tests for wallet restore
|
|
|
|
#[macro_use]
|
|
|
|
extern crate log;
|
2019-03-17 22:14:58 +03:00
|
|
|
extern crate grin_wallet_controller as wallet;
|
|
|
|
extern crate grin_wallet_impls as impls;
|
2019-03-14 15:06:03 +03:00
|
|
|
extern crate grin_wallet_libwallet as libwallet;
|
2019-02-14 16:40:29 +03:00
|
|
|
|
2019-03-26 19:02:31 +03:00
|
|
|
use grin_wallet_util::grin_keychain as keychain;
|
|
|
|
|
2019-02-13 18:05:19 +03:00
|
|
|
use self::keychain::{ExtKeychain, Identifier, Keychain};
|
2019-04-24 11:27:14 +03:00
|
|
|
use self::libwallet::{AcctPathMapping, InitTxArgs, Slate};
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
use impls::test_framework::{self, LocalWalletClient};
|
2019-02-13 18:05:19 +03:00
|
|
|
use std::fs;
|
|
|
|
use std::sync::atomic::Ordering;
|
|
|
|
use std::thread;
|
|
|
|
use std::time::Duration;
|
|
|
|
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
#[macro_use]
|
|
|
|
mod common;
|
|
|
|
use common::{create_wallet_proxy, setup};
|
|
|
|
|
|
|
|
fn restore_wallet(base_dir: &'static str, wallet_dir: &str) -> Result<(), libwallet::Error> {
|
|
|
|
let source_seed = format!("{}/{}/wallet_data/wallet.seed", base_dir, wallet_dir);
|
|
|
|
let dest_wallet_name = format!("{}_restore", wallet_dir);
|
|
|
|
let dest_dir = format!("{}/{}/wallet_data", base_dir, dest_wallet_name);
|
|
|
|
|
|
|
|
let mut wallet_proxy = create_wallet_proxy(base_dir);
|
|
|
|
create_wallet_and_add!(
|
|
|
|
client,
|
|
|
|
wallet,
|
|
|
|
base_dir,
|
|
|
|
&dest_wallet_name,
|
|
|
|
None,
|
|
|
|
&mut wallet_proxy
|
|
|
|
);
|
|
|
|
// close created wallet
|
|
|
|
let mut w_lock = wallet.lock();
|
|
|
|
let lc = w_lock.lc_provider()?;
|
|
|
|
lc.close_wallet(None)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
let dest_seed = format!("{}/wallet.seed", dest_dir);
|
|
|
|
println!("Source: {}, Dest: {}", source_seed, dest_seed);
|
|
|
|
fs::copy(source_seed, dest_seed)?;
|
|
|
|
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
// reopen with new seed
|
|
|
|
open_wallet_and_add!(
|
|
|
|
client,
|
|
|
|
wallet,
|
|
|
|
&base_dir,
|
|
|
|
&dest_wallet_name,
|
|
|
|
&mut wallet_proxy
|
|
|
|
);
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
// Set the wallet proxy listener running
|
|
|
|
let wp_running = wallet_proxy.running.clone();
|
|
|
|
thread::spawn(move || {
|
|
|
|
if let Err(e) = wallet_proxy.run() {
|
|
|
|
error!("Wallet Proxy error: {}", e);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// perform the restore and update wallet info
|
|
|
|
wallet::controller::owner_single_use(wallet.clone(), |api| {
|
|
|
|
let _ = api.restore()?;
|
|
|
|
let _ = api.retrieve_summary_info(true, 1)?;
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
wp_running.store(false, Ordering::Relaxed);
|
|
|
|
//thread::sleep(Duration::from_millis(1000));
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn compare_wallet_restore(
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
base_dir: &'static str,
|
2019-02-13 18:05:19 +03:00
|
|
|
wallet_dir: &str,
|
|
|
|
account_path: &Identifier,
|
|
|
|
) -> Result<(), libwallet::Error> {
|
|
|
|
let restore_name = format!("{}_restore", wallet_dir);
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
let mut wallet_proxy = create_wallet_proxy(base_dir);
|
2019-02-13 18:05:19 +03:00
|
|
|
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
open_wallet_and_add!(
|
|
|
|
client,
|
|
|
|
wallet_source,
|
|
|
|
&base_dir,
|
2019-02-13 18:05:19 +03:00
|
|
|
&wallet_dir,
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
&mut wallet_proxy
|
2019-02-13 18:05:19 +03:00
|
|
|
);
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
open_wallet_and_add!(
|
|
|
|
client,
|
|
|
|
wallet_dest,
|
|
|
|
&base_dir,
|
2019-02-13 18:05:19 +03:00
|
|
|
&restore_name,
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
&mut wallet_proxy
|
2019-02-13 18:05:19 +03:00
|
|
|
);
|
|
|
|
|
|
|
|
{
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
wallet_inst!(wallet_source, w);
|
2019-02-13 18:05:19 +03:00
|
|
|
w.set_parent_key_id(account_path.clone());
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
wallet_inst!(wallet_dest, w);
|
2019-02-13 18:05:19 +03:00
|
|
|
w.set_parent_key_id(account_path.clone());
|
|
|
|
}
|
|
|
|
|
|
|
|
// Set the wallet proxy listener running
|
|
|
|
let wp_running = wallet_proxy.running.clone();
|
|
|
|
thread::spawn(move || {
|
|
|
|
if let Err(e) = wallet_proxy.run() {
|
|
|
|
error!("Wallet Proxy error: {}", e);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
2019-04-24 11:27:14 +03:00
|
|
|
let mut src_info: Option<libwallet::WalletInfo> = None;
|
|
|
|
let mut dest_info: Option<libwallet::WalletInfo> = None;
|
2019-02-13 18:05:19 +03:00
|
|
|
|
2019-04-24 11:27:14 +03:00
|
|
|
let mut src_txs: Option<Vec<libwallet::TxLogEntry>> = None;
|
|
|
|
let mut dest_txs: Option<Vec<libwallet::TxLogEntry>> = None;
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
let mut src_accts: Option<Vec<AcctPathMapping>> = None;
|
|
|
|
let mut dest_accts: Option<Vec<AcctPathMapping>> = None;
|
|
|
|
|
|
|
|
// Overall wallet info should be the same
|
|
|
|
wallet::controller::owner_single_use(wallet_source.clone(), |api| {
|
|
|
|
src_info = Some(api.retrieve_summary_info(true, 1)?.1);
|
|
|
|
src_txs = Some(api.retrieve_txs(true, None, None)?.1);
|
|
|
|
src_accts = Some(api.accounts()?);
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
wallet::controller::owner_single_use(wallet_dest.clone(), |api| {
|
|
|
|
dest_info = Some(api.retrieve_summary_info(true, 1)?.1);
|
|
|
|
dest_txs = Some(api.retrieve_txs(true, None, None)?.1);
|
|
|
|
dest_accts = Some(api.accounts()?);
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// Info should all be the same
|
|
|
|
assert_eq!(src_info, dest_info);
|
|
|
|
|
|
|
|
// Net differences in TX logs should be the same
|
|
|
|
let src_sum: i64 = src_txs
|
|
|
|
.clone()
|
|
|
|
.unwrap()
|
|
|
|
.iter()
|
|
|
|
.map(|t| t.amount_credited as i64 - t.amount_debited as i64)
|
|
|
|
.sum();
|
|
|
|
|
|
|
|
let dest_sum: i64 = dest_txs
|
|
|
|
.clone()
|
|
|
|
.unwrap()
|
|
|
|
.iter()
|
|
|
|
.map(|t| t.amount_credited as i64 - t.amount_debited as i64)
|
|
|
|
.sum();
|
|
|
|
|
|
|
|
assert_eq!(src_sum, dest_sum);
|
|
|
|
|
|
|
|
// Number of created accounts should be the same
|
|
|
|
assert_eq!(
|
|
|
|
src_accts.as_ref().unwrap().len(),
|
|
|
|
dest_accts.as_ref().unwrap().len()
|
|
|
|
);
|
|
|
|
|
|
|
|
wp_running.store(false, Ordering::Relaxed);
|
|
|
|
//thread::sleep(Duration::from_millis(1000));
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Build up 2 wallets, perform a few transactions on them
|
|
|
|
/// Then attempt to restore them in separate directories and check contents are the same
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
fn setup_restore(test_dir: &'static str) -> Result<(), libwallet::Error> {
|
2019-02-13 18:05:19 +03:00
|
|
|
setup(test_dir);
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
|
2019-02-13 18:05:19 +03:00
|
|
|
// Create a new proxy to simulate server and wallet responses
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
let mut wallet_proxy = create_wallet_proxy(test_dir);
|
2019-02-13 18:05:19 +03:00
|
|
|
let chain = wallet_proxy.chain.clone();
|
|
|
|
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
create_wallet_and_add!(
|
|
|
|
client1,
|
|
|
|
wallet1,
|
|
|
|
test_dir,
|
|
|
|
"wallet1",
|
|
|
|
None,
|
|
|
|
&mut wallet_proxy
|
|
|
|
);
|
|
|
|
create_wallet_and_add!(
|
|
|
|
client2,
|
|
|
|
wallet2,
|
|
|
|
test_dir,
|
|
|
|
"wallet2",
|
|
|
|
None,
|
|
|
|
&mut wallet_proxy
|
|
|
|
);
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
// wallet 2 will use another account
|
|
|
|
wallet::controller::owner_single_use(wallet2.clone(), |api| {
|
|
|
|
api.create_account_path("account1")?;
|
|
|
|
api.create_account_path("account2")?;
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// Default wallet 2 to listen on that account
|
|
|
|
{
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
wallet_inst!(wallet2, w);
|
2019-02-13 18:05:19 +03:00
|
|
|
w.set_parent_key_id_by_name("account1")?;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Another wallet
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
create_wallet_and_add!(
|
|
|
|
client3,
|
|
|
|
wallet3,
|
|
|
|
test_dir,
|
|
|
|
"wallet3",
|
|
|
|
None,
|
|
|
|
&mut wallet_proxy
|
|
|
|
);
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
// Set the wallet proxy listener running
|
|
|
|
let wp_running = wallet_proxy.running.clone();
|
|
|
|
thread::spawn(move || {
|
|
|
|
if let Err(e) = wallet_proxy.run() {
|
|
|
|
error!("Wallet Proxy error: {}", e);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// mine a few blocks
|
2019-03-22 15:03:25 +03:00
|
|
|
let _ = test_framework::award_blocks_to_wallet(&chain, wallet1.clone(), 10, false);
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
// assert wallet contents
|
|
|
|
// and a single use api for a send command
|
|
|
|
let amount = 60_000_000_000;
|
|
|
|
let mut slate = Slate::blank(1);
|
|
|
|
wallet::controller::owner_single_use(wallet1.clone(), |sender_api| {
|
|
|
|
// note this will increment the block count as part of the transaction "Posting"
|
2019-03-29 19:00:02 +03:00
|
|
|
let args = InitTxArgs {
|
|
|
|
src_acct_name: None,
|
|
|
|
amount: amount,
|
|
|
|
minimum_confirmations: 2,
|
|
|
|
max_outputs: 500,
|
|
|
|
num_change_outputs: 1,
|
|
|
|
selection_strategy_is_use_all: true,
|
|
|
|
..Default::default()
|
|
|
|
};
|
2019-05-01 22:12:23 +03:00
|
|
|
let slate_i = sender_api.init_send_tx(args)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
slate = client1.send_tx_slate_direct("wallet2", &slate_i)?;
|
2019-05-23 18:27:57 +03:00
|
|
|
sender_api.tx_lock_outputs(&slate, 0)?;
|
2019-03-22 15:03:25 +03:00
|
|
|
slate = sender_api.finalize_tx(&slate)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
sender_api.post_tx(&slate.tx, false)?;
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// mine a few more blocks
|
2019-03-22 15:03:25 +03:00
|
|
|
let _ = test_framework::award_blocks_to_wallet(&chain, wallet1.clone(), 3, false);
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
// Send some to wallet 3
|
|
|
|
wallet::controller::owner_single_use(wallet1.clone(), |sender_api| {
|
|
|
|
// note this will increment the block count as part of the transaction "Posting"
|
2019-03-29 19:00:02 +03:00
|
|
|
let args = InitTxArgs {
|
|
|
|
src_acct_name: None,
|
|
|
|
amount: amount * 2,
|
|
|
|
minimum_confirmations: 2,
|
|
|
|
max_outputs: 500,
|
|
|
|
num_change_outputs: 1,
|
|
|
|
selection_strategy_is_use_all: true,
|
|
|
|
..Default::default()
|
|
|
|
};
|
2019-05-01 22:12:23 +03:00
|
|
|
let slate_i = sender_api.init_send_tx(args)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
slate = client1.send_tx_slate_direct("wallet3", &slate_i)?;
|
2019-05-23 18:27:57 +03:00
|
|
|
sender_api.tx_lock_outputs(&slate, 0)?;
|
2019-03-22 15:03:25 +03:00
|
|
|
slate = sender_api.finalize_tx(&slate)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
sender_api.post_tx(&slate.tx, false)?;
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// mine a few more blocks
|
2019-03-22 15:03:25 +03:00
|
|
|
let _ = test_framework::award_blocks_to_wallet(&chain, wallet3.clone(), 10, false);
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
// Wallet3 to wallet 2
|
|
|
|
wallet::controller::owner_single_use(wallet3.clone(), |sender_api| {
|
|
|
|
// note this will increment the block count as part of the transaction "Posting"
|
2019-03-29 19:00:02 +03:00
|
|
|
let args = InitTxArgs {
|
|
|
|
src_acct_name: None,
|
|
|
|
amount: amount * 3,
|
|
|
|
minimum_confirmations: 2,
|
|
|
|
max_outputs: 500,
|
|
|
|
num_change_outputs: 1,
|
|
|
|
selection_strategy_is_use_all: true,
|
|
|
|
..Default::default()
|
|
|
|
};
|
2019-05-01 22:12:23 +03:00
|
|
|
let slate_i = sender_api.init_send_tx(args)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
slate = client3.send_tx_slate_direct("wallet2", &slate_i)?;
|
2019-05-23 18:27:57 +03:00
|
|
|
sender_api.tx_lock_outputs(&slate, 0)?;
|
2019-03-22 15:03:25 +03:00
|
|
|
slate = sender_api.finalize_tx(&slate)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
sender_api.post_tx(&slate.tx, false)?;
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// Another listener account on wallet 2
|
|
|
|
{
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
wallet_inst!(wallet2, w);
|
2019-02-13 18:05:19 +03:00
|
|
|
w.set_parent_key_id_by_name("account2")?;
|
|
|
|
}
|
|
|
|
|
|
|
|
// mine a few more blocks
|
2019-03-22 15:03:25 +03:00
|
|
|
let _ = test_framework::award_blocks_to_wallet(&chain, wallet1.clone(), 2, false);
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
// Wallet3 to wallet 2 again (to another account)
|
|
|
|
wallet::controller::owner_single_use(wallet3.clone(), |sender_api| {
|
|
|
|
// note this will increment the block count as part of the transaction "Posting"
|
2019-03-29 19:00:02 +03:00
|
|
|
let args = InitTxArgs {
|
|
|
|
src_acct_name: None,
|
|
|
|
amount: amount * 3,
|
|
|
|
minimum_confirmations: 2,
|
|
|
|
max_outputs: 500,
|
|
|
|
num_change_outputs: 1,
|
|
|
|
selection_strategy_is_use_all: true,
|
|
|
|
..Default::default()
|
|
|
|
};
|
2019-05-01 22:12:23 +03:00
|
|
|
let slate_i = sender_api.init_send_tx(args)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
slate = client3.send_tx_slate_direct("wallet2", &slate_i)?;
|
2019-05-23 18:27:57 +03:00
|
|
|
sender_api.tx_lock_outputs(&slate, 0)?;
|
2019-03-22 15:03:25 +03:00
|
|
|
slate = sender_api.finalize_tx(&slate)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
sender_api.post_tx(&slate.tx, false)?;
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// mine a few more blocks
|
2019-03-22 15:03:25 +03:00
|
|
|
let _ = test_framework::award_blocks_to_wallet(&chain, wallet1.clone(), 5, false);
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
// update everyone
|
|
|
|
wallet::controller::owner_single_use(wallet1.clone(), |api| {
|
|
|
|
let _ = api.retrieve_summary_info(true, 1)?;
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
wallet::controller::owner_single_use(wallet2.clone(), |api| {
|
|
|
|
let _ = api.retrieve_summary_info(true, 1)?;
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
wallet::controller::owner_single_use(wallet3.clone(), |api| {
|
|
|
|
let _ = api.retrieve_summary_info(true, 1)?;
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
wp_running.store(false, Ordering::Relaxed);
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
Merge milestone/2.1.0 into master (#199)
* 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
2019-07-29 15:25:03 +03:00
|
|
|
fn perform_restore(test_dir: &'static str) -> Result<(), libwallet::Error> {
|
2019-02-13 18:05:19 +03:00
|
|
|
restore_wallet(test_dir, "wallet1")?;
|
|
|
|
compare_wallet_restore(
|
|
|
|
test_dir,
|
|
|
|
"wallet1",
|
|
|
|
&ExtKeychain::derive_key_id(2, 0, 0, 0, 0),
|
|
|
|
)?;
|
|
|
|
restore_wallet(test_dir, "wallet2")?;
|
|
|
|
compare_wallet_restore(
|
|
|
|
test_dir,
|
|
|
|
"wallet2",
|
|
|
|
&ExtKeychain::derive_key_id(2, 0, 0, 0, 0),
|
|
|
|
)?;
|
|
|
|
compare_wallet_restore(
|
|
|
|
test_dir,
|
|
|
|
"wallet2",
|
|
|
|
&ExtKeychain::derive_key_id(2, 1, 0, 0, 0),
|
|
|
|
)?;
|
|
|
|
compare_wallet_restore(
|
|
|
|
test_dir,
|
|
|
|
"wallet2",
|
|
|
|
&ExtKeychain::derive_key_id(2, 2, 0, 0, 0),
|
|
|
|
)?;
|
|
|
|
restore_wallet(test_dir, "wallet3")?;
|
|
|
|
compare_wallet_restore(
|
|
|
|
test_dir,
|
|
|
|
"wallet3",
|
|
|
|
&ExtKeychain::derive_key_id(2, 0, 0, 0, 0),
|
|
|
|
)?;
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn wallet_restore() {
|
|
|
|
let test_dir = "test_output/wallet_restore";
|
|
|
|
if let Err(e) = setup_restore(test_dir) {
|
|
|
|
panic!("Libwallet Error: {} - {}", e, e.backtrace().unwrap());
|
|
|
|
}
|
|
|
|
if let Err(e) = perform_restore(test_dir) {
|
|
|
|
panic!("Libwallet Error: {} - {}", e, e.backtrace().unwrap());
|
|
|
|
}
|
|
|
|
// let logging finish
|
|
|
|
thread::sleep(Duration::from_millis(200));
|
|
|
|
}
|