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 differing accounts in the same wallet
|
|
|
|
#[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-02-13 18:05:19 +03:00
|
|
|
|
2019-03-26 19:02:31 +03:00
|
|
|
use grin_wallet_util::grin_core as core;
|
|
|
|
use grin_wallet_util::grin_keychain as keychain;
|
|
|
|
|
2019-02-13 18:05:19 +03:00
|
|
|
use self::core::global;
|
|
|
|
use self::keychain::{ExtKeychain, Keychain};
|
2019-03-14 15:06:03 +03:00
|
|
|
use grin_wallet_libwallet as libwallet;
|
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-04-24 11:27:14 +03:00
|
|
|
use libwallet::InitTxArgs;
|
2019-02-13 18:05:19 +03:00
|
|
|
use std::thread;
|
|
|
|
use std::time::Duration;
|
2019-02-14 16:40:29 +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
|
|
|
#[macro_use]
|
|
|
|
mod common;
|
2019-08-19 15:05:21 +03:00
|
|
|
use common::{clean_output_dir, create_wallet_proxy, setup};
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
/// Various tests on accounts within the same 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
|
|
|
fn accounts_test_impl(test_dir: &'static str) -> Result<(), libwallet::Error> {
|
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,
|
2019-08-06 14:50:41 +03:00
|
|
|
mask1_i,
|
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
|
|
|
test_dir,
|
|
|
|
"wallet1",
|
|
|
|
None,
|
2019-08-06 14:50:41 +03:00
|
|
|
&mut wallet_proxy,
|
|
|
|
false
|
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-08-06 14:50:41 +03:00
|
|
|
|
|
|
|
let mask1 = (&mask1_i).as_ref();
|
|
|
|
|
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!(
|
|
|
|
client2,
|
|
|
|
wallet2,
|
2019-08-06 14:50:41 +03:00
|
|
|
mask2_i,
|
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
|
|
|
test_dir,
|
|
|
|
"wallet2",
|
|
|
|
None,
|
2019-08-06 14:50:41 +03:00
|
|
|
&mut wallet_proxy,
|
|
|
|
false
|
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
|
|
|
|
2019-08-06 14:50:41 +03:00
|
|
|
let mask2 = (&mask2_i).as_ref();
|
|
|
|
|
2019-02-13 18:05:19 +03:00
|
|
|
// Set the wallet proxy listener running
|
|
|
|
thread::spawn(move || {
|
|
|
|
if let Err(e) = wallet_proxy.run() {
|
|
|
|
error!("Wallet Proxy error: {}", e);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// few values to keep things shorter
|
|
|
|
let reward = core::consensus::REWARD;
|
|
|
|
let cm = global::coinbase_maturity(); // assume all testing precedes soft fork height
|
|
|
|
|
|
|
|
// test default accounts exist
|
2019-08-06 14:50:41 +03:00
|
|
|
wallet::controller::owner_single_use(wallet1.clone(), mask1, |api, m| {
|
|
|
|
let accounts = api.accounts(m)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(accounts[0].label, "default");
|
|
|
|
assert_eq!(accounts[0].path, ExtKeychain::derive_key_id(2, 0, 0, 0, 0));
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// add some accounts
|
2019-08-06 14:50:41 +03:00
|
|
|
wallet::controller::owner_single_use(wallet1.clone(), mask1, |api, m| {
|
|
|
|
let new_path = api.create_account_path(m, "account1").unwrap();
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(new_path, ExtKeychain::derive_key_id(2, 1, 0, 0, 0));
|
2019-08-06 14:50:41 +03:00
|
|
|
let new_path = api.create_account_path(m, "account2").unwrap();
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(new_path, ExtKeychain::derive_key_id(2, 2, 0, 0, 0));
|
2019-08-06 14:50:41 +03:00
|
|
|
let new_path = api.create_account_path(m, "account3").unwrap();
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(new_path, ExtKeychain::derive_key_id(2, 3, 0, 0, 0));
|
|
|
|
// trying to add same label again should fail
|
2019-08-06 14:50:41 +03:00
|
|
|
let res = api.create_account_path(m, "account1");
|
2019-02-13 18:05:19 +03:00
|
|
|
assert!(res.is_err());
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// add account to wallet 2
|
2019-08-06 14:50:41 +03:00
|
|
|
wallet::controller::owner_single_use(wallet2.clone(), mask2, |api, m| {
|
|
|
|
let new_path = api.create_account_path(m, "listener_account").unwrap();
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(new_path, ExtKeychain::derive_key_id(2, 1, 0, 0, 0));
|
|
|
|
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("listener_account")?;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Mine into two different accounts in the same 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
|
|
|
wallet_inst!(wallet1, w);
|
2019-02-13 18:05:19 +03:00
|
|
|
w.set_parent_key_id_by_name("account1")?;
|
|
|
|
assert_eq!(w.parent_key_id(), ExtKeychain::derive_key_id(2, 1, 0, 0, 0));
|
|
|
|
}
|
2019-08-06 14:50:41 +03:00
|
|
|
let _ = test_framework::award_blocks_to_wallet(&chain, wallet1.clone(), mask1, 7, false);
|
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!(wallet1, w);
|
2019-02-13 18:05:19 +03:00
|
|
|
w.set_parent_key_id_by_name("account2")?;
|
|
|
|
assert_eq!(w.parent_key_id(), ExtKeychain::derive_key_id(2, 2, 0, 0, 0));
|
|
|
|
}
|
2019-08-06 14:50:41 +03:00
|
|
|
let _ = test_framework::award_blocks_to_wallet(&chain, wallet1.clone(), mask1, 5, false);
|
2019-02-13 18:05:19 +03:00
|
|
|
|
|
|
|
// Should have 5 in account1 (5 spendable), 5 in account (2 spendable)
|
2019-08-06 14:50:41 +03:00
|
|
|
wallet::controller::owner_single_use(wallet1.clone(), mask1, |api, m| {
|
|
|
|
let (wallet1_refreshed, wallet1_info) = api.retrieve_summary_info(m, true, 1)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert!(wallet1_refreshed);
|
|
|
|
assert_eq!(wallet1_info.last_confirmed_height, 12);
|
|
|
|
assert_eq!(wallet1_info.total, 5 * reward);
|
|
|
|
assert_eq!(wallet1_info.amount_currently_spendable, (5 - cm) * reward);
|
|
|
|
// check tx log as well
|
2019-08-06 14:50:41 +03:00
|
|
|
let (_, txs) = api.retrieve_txs(m, true, None, None)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(txs.len(), 5);
|
|
|
|
Ok(())
|
|
|
|
})?;
|
2019-08-20 02:51:35 +03:00
|
|
|
|
2019-02-13 18:05:19 +03:00
|
|
|
// now check second account
|
|
|
|
{
|
2019-08-20 02:51:35 +03:00
|
|
|
// let mut w_lock = wallet1.lock();
|
|
|
|
// let lc = w_lock.lc_provider()?;
|
|
|
|
// let w = lc.wallet_inst()?;
|
|
|
|
wallet_inst!(wallet1, w);
|
2019-02-13 18:05:19 +03:00
|
|
|
w.set_parent_key_id_by_name("account1")?;
|
|
|
|
}
|
2019-08-20 02:51:35 +03:00
|
|
|
|
2019-08-06 14:50:41 +03:00
|
|
|
wallet::controller::owner_single_use(wallet1.clone(), mask1, |api, m| {
|
2019-02-13 18:05:19 +03:00
|
|
|
// check last confirmed height on this account is different from above (should be 0)
|
2019-08-06 14:50:41 +03:00
|
|
|
let (_, wallet1_info) = api.retrieve_summary_info(m, false, 1)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(wallet1_info.last_confirmed_height, 0);
|
2019-08-06 14:50:41 +03:00
|
|
|
let (wallet1_refreshed, wallet1_info) = api.retrieve_summary_info(m, true, 1)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert!(wallet1_refreshed);
|
|
|
|
assert_eq!(wallet1_info.last_confirmed_height, 12);
|
|
|
|
assert_eq!(wallet1_info.total, 7 * reward);
|
|
|
|
assert_eq!(wallet1_info.amount_currently_spendable, 7 * reward);
|
|
|
|
// check tx log as well
|
2019-08-06 14:50:41 +03:00
|
|
|
let (_, txs) = api.retrieve_txs(m, true, None, None)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(txs.len(), 7);
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// should be nothing in default 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!(wallet1, w);
|
2019-02-13 18:05:19 +03:00
|
|
|
w.set_parent_key_id_by_name("default")?;
|
|
|
|
}
|
2019-08-06 14:50:41 +03:00
|
|
|
wallet::controller::owner_single_use(wallet1.clone(), mask1, |api, m| {
|
|
|
|
let (_, wallet1_info) = api.retrieve_summary_info(m, false, 1)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(wallet1_info.last_confirmed_height, 0);
|
2019-08-06 14:50:41 +03:00
|
|
|
let (wallet1_refreshed, wallet1_info) = api.retrieve_summary_info(m, true, 1)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert!(wallet1_refreshed);
|
|
|
|
assert_eq!(wallet1_info.last_confirmed_height, 12);
|
|
|
|
assert_eq!(wallet1_info.total, 0,);
|
|
|
|
assert_eq!(wallet1_info.amount_currently_spendable, 0,);
|
|
|
|
// check tx log as well
|
2019-08-06 14:50:41 +03:00
|
|
|
let (_, txs) = api.retrieve_txs(m, true, None, None)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(txs.len(), 0);
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// Send a tx to 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
|
|
|
wallet_inst!(wallet1, w);
|
2019-02-13 18:05:19 +03:00
|
|
|
w.set_parent_key_id_by_name("account1")?;
|
|
|
|
}
|
2019-08-06 14:50:41 +03:00
|
|
|
wallet::controller::owner_single_use(wallet1.clone(), mask1, |api, m| {
|
2019-03-29 19:00:02 +03:00
|
|
|
let args = InitTxArgs {
|
|
|
|
src_acct_name: None,
|
|
|
|
amount: reward,
|
|
|
|
minimum_confirmations: 2,
|
|
|
|
max_outputs: 500,
|
|
|
|
num_change_outputs: 1,
|
|
|
|
selection_strategy_is_use_all: true,
|
|
|
|
..Default::default()
|
|
|
|
};
|
2019-08-06 14:50:41 +03:00
|
|
|
let mut slate = api.init_send_tx(m, args)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
slate = client1.send_tx_slate_direct("wallet2", &slate)?;
|
2019-08-06 14:50:41 +03:00
|
|
|
api.tx_lock_outputs(m, &slate, 0)?;
|
|
|
|
slate = api.finalize_tx(m, &slate)?;
|
|
|
|
api.post_tx(m, &slate.tx, false)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
2019-08-06 14:50:41 +03:00
|
|
|
wallet::controller::owner_single_use(wallet1.clone(), mask1, |api, m| {
|
|
|
|
let (wallet1_refreshed, wallet1_info) = api.retrieve_summary_info(m, true, 1)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert!(wallet1_refreshed);
|
|
|
|
assert_eq!(wallet1_info.last_confirmed_height, 13);
|
2019-08-06 14:50:41 +03:00
|
|
|
let (_, txs) = api.retrieve_txs(m, true, None, None)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(txs.len(), 9);
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// other account should be untouched
|
|
|
|
{
|
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!(wallet1, w);
|
2019-02-13 18:05:19 +03:00
|
|
|
w.set_parent_key_id_by_name("account2")?;
|
|
|
|
}
|
2019-08-06 14:50:41 +03:00
|
|
|
wallet::controller::owner_single_use(wallet1.clone(), mask1, |api, m| {
|
|
|
|
let (_, wallet1_info) = api.retrieve_summary_info(m, false, 1)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(wallet1_info.last_confirmed_height, 12);
|
2019-08-06 14:50:41 +03:00
|
|
|
let (_, wallet1_info) = api.retrieve_summary_info(m, true, 1)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(wallet1_info.last_confirmed_height, 13);
|
2019-08-06 14:50:41 +03:00
|
|
|
let (_, txs) = api.retrieve_txs(m, true, None, None)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
println!("{:?}", txs);
|
|
|
|
assert_eq!(txs.len(), 5);
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// wallet 2 should only have this tx on the listener account
|
2019-08-06 14:50:41 +03:00
|
|
|
wallet::controller::owner_single_use(wallet2.clone(), mask2, |api, m| {
|
|
|
|
let (wallet2_refreshed, wallet2_info) = api.retrieve_summary_info(m, true, 1)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert!(wallet2_refreshed);
|
|
|
|
assert_eq!(wallet2_info.last_confirmed_height, 13);
|
2019-08-06 14:50:41 +03:00
|
|
|
let (_, txs) = api.retrieve_txs(m, true, None, None)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(txs.len(), 1);
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
// Default account on wallet 2 should be untouched
|
|
|
|
{
|
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("default")?;
|
|
|
|
}
|
2019-08-06 14:50:41 +03:00
|
|
|
wallet::controller::owner_single_use(wallet2.clone(), mask2, |api, m| {
|
|
|
|
let (_, wallet2_info) = api.retrieve_summary_info(m, false, 1)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(wallet2_info.last_confirmed_height, 0);
|
2019-08-06 14:50:41 +03:00
|
|
|
let (wallet2_refreshed, wallet2_info) = api.retrieve_summary_info(m, true, 1)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert!(wallet2_refreshed);
|
|
|
|
assert_eq!(wallet2_info.last_confirmed_height, 13);
|
|
|
|
assert_eq!(wallet2_info.total, 0,);
|
|
|
|
assert_eq!(wallet2_info.amount_currently_spendable, 0,);
|
|
|
|
// check tx log as well
|
2019-08-06 14:50:41 +03:00
|
|
|
let (_, txs) = api.retrieve_txs(m, true, None, None)?;
|
2019-02-13 18:05:19 +03:00
|
|
|
assert_eq!(txs.len(), 0);
|
|
|
|
Ok(())
|
|
|
|
})?;
|
|
|
|
|
|
|
|
// let logging finish
|
|
|
|
thread::sleep(Duration::from_millis(200));
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn accounts() {
|
|
|
|
let test_dir = "test_output/accounts";
|
2019-08-19 15:05:21 +03:00
|
|
|
setup(test_dir);
|
2019-02-13 18:05:19 +03:00
|
|
|
if let Err(e) = accounts_test_impl(test_dir) {
|
|
|
|
panic!("Libwallet Error: {} - {}", e, e.backtrace().unwrap());
|
|
|
|
}
|
2019-08-19 15:05:21 +03:00
|
|
|
clean_output_dir(test_dir);
|
2019-02-13 18:05:19 +03:00
|
|
|
}
|