mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
Merge pull request #1195
697ce1d
libwallet_api: reverted deleted curly brace (Ilya Kitaev)bb9094f
libwallet_api: fixes for transaction history (Ilya Kitaev)62b3708
libwallet_api: do not signal on sent/received tx until wallet completely synchronized (Ilya Kitaev)11fab41
libwallet_api: TransactionHistory: read/write syncchronization (Ilya Kitaev)559f379
libwallet_api: test: adjusted mixin_count=4 as it's minumum allowed (Ilya Kitaev)8b0cb8c
libwallet_api: some renamings (Ilya Kitaev)db3282c
Initialize transaction history if empty (Ilya Kitaev)85f5e73
libwallet_api: fixes for transaction history (Ilya Kitaev)
This commit is contained in:
commit
0673db16ad
6 changed files with 77 additions and 25 deletions
|
@ -539,8 +539,10 @@ TEST_F(WalletTest1, WalletReturnsDaemonBlockHeight)
|
|||
TEST_F(WalletTest1, WalletRefresh)
|
||||
{
|
||||
|
||||
std::cout << "Opening wallet: " << CURRENT_SRC_WALLET << std::endl;
|
||||
Bitmonero::Wallet * wallet1 = wmgr->openWallet(CURRENT_SRC_WALLET, TESTNET_WALLET_PASS, true);
|
||||
// make sure testnet daemon is running
|
||||
std::cout << "connecting to daemon: " << TESTNET_DAEMON_ADDRESS << std::endl;
|
||||
ASSERT_TRUE(wallet1->init(TESTNET_DAEMON_ADDRESS, 0));
|
||||
ASSERT_TRUE(wallet1->refresh());
|
||||
ASSERT_TRUE(wmgr->closeWallet(wallet1));
|
||||
|
@ -570,13 +572,14 @@ TEST_F(WalletTest1, WalletTransaction)
|
|||
ASSERT_TRUE(wallet1->status() == Bitmonero::PendingTransaction::Status_Ok);
|
||||
|
||||
std::string recepient_address = Utils::get_wallet_address(CURRENT_DST_WALLET, TESTNET_WALLET_PASS);
|
||||
wallet1->setDefaultMixin(1);
|
||||
ASSERT_TRUE(wallet1->defaultMixin() == 1);
|
||||
const int MIXIN_COUNT = 4;
|
||||
|
||||
|
||||
Bitmonero::PendingTransaction * transaction = wallet1->createTransaction(recepient_address,
|
||||
PAYMENT_ID_EMPTY,
|
||||
AMOUNT_10XMR,
|
||||
1);
|
||||
MIXIN_COUNT,
|
||||
Bitmonero::PendingTransaction::Priority_Medium);
|
||||
ASSERT_TRUE(transaction->status() == Bitmonero::PendingTransaction::Status_Ok);
|
||||
wallet1->refresh();
|
||||
|
||||
|
@ -1146,10 +1149,10 @@ int main(int argc, char** argv)
|
|||
TESTNET_WALLET5_NAME = WALLETS_ROOT_DIR + "/wallet_05.bin";
|
||||
TESTNET_WALLET6_NAME = WALLETS_ROOT_DIR + "/wallet_06.bin";
|
||||
|
||||
CURRENT_SRC_WALLET = TESTNET_WALLET6_NAME;
|
||||
CURRENT_DST_WALLET = TESTNET_WALLET5_NAME;
|
||||
CURRENT_SRC_WALLET = TESTNET_WALLET5_NAME;
|
||||
CURRENT_DST_WALLET = TESTNET_WALLET1_NAME;
|
||||
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
// Bitmonero::WalletManagerFactory::setLogLevel(Bitmonero::WalletManagerFactory::LogLevel_Max);
|
||||
Bitmonero::WalletManagerFactory::setLogLevel(Bitmonero::WalletManagerFactory::LogLevel_Max);
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue