diff --git a/core/test/integration/synchronization/synchronization_tests.cpp b/core/test/integration/synchronization/synchronization_tests.cpp index 5a216bae5b..072497088e 100644 --- a/core/test/integration/synchronization/synchronization_tests.cpp +++ b/core/test/integration/synchronization/synchronization_tests.cpp @@ -187,8 +187,9 @@ TEST_F(BitcoinLikeWalletSynchronization, MediumLTCXpubSynchronization) { TEST_F(BitcoinLikeWalletSynchronization, SynchronizeOnceAtATime) { auto pool = newDefaultPool(); { - auto wallet = uv::wait(pool->createWallet("e847815f-488a-4301-b67c-378a5e9c8a62", "bitcoin", - api::DynamicObject::newInstance())); + auto configuration = DynamicObject::newInstance(); + configuration->putString(api::Configuration::BLOCKCHAIN_EXPLORER_VERSION, "v3"); + auto wallet = uv::wait(pool->createWallet("e847815f-488a-4301-b67c-378a5e9c8a62", "bitcoin", configuration)); { auto nextIndex = uv::wait(wallet->getNextAccountIndex()); EXPECT_EQ(nextIndex, 0); @@ -220,8 +221,9 @@ TEST_F(BitcoinLikeWalletSynchronization, SynchronizeOnceAtATime) { TEST_F(BitcoinLikeWalletSynchronization, SynchronizeAndFreshResetAll) { { auto pool = newDefaultPool(); - auto wallet = uv::wait(pool->createWallet("e847815f-488a-4301-b67c-378a5e9c8a62", "bitcoin", - api::DynamicObject::newInstance())); + auto configuration = DynamicObject::newInstance(); + configuration->putString(api::Configuration::BLOCKCHAIN_EXPLORER_VERSION, "v3"); + auto wallet = uv::wait(pool->createWallet("e847815f-488a-4301-b67c-378a5e9c8a62", "bitcoin", configuration)); { auto nextIndex = uv::wait(wallet->getNextAccountIndex()); EXPECT_EQ(nextIndex, 0); @@ -256,13 +258,14 @@ TEST_F(BitcoinLikeWalletSynchronization, SynchronizeAndFreshResetAll) { } } -TEST_F(BitcoinLikeWalletSynchronization, SynchronizeFromLastBlock) { +TEST_F(BitcoinLikeWalletSynchronization, DISABLED_SynchronizeFromLastBlock) { auto pool = newDefaultPool(); { - auto wallet = uv::wait(pool->createWallet("e847815f-488a-4301-b67c-378a5e9c8a63", "bitcoin", - api::DynamicObject::newInstance())); + auto configuration = DynamicObject::newInstance(); + configuration->putString(api::Configuration::BLOCKCHAIN_EXPLORER_VERSION, "v3"); + auto wallet = uv::wait(pool->createWallet("e847815f-488a-4301-b67c-378a5e9c8a63", "bitcoin", configuration)); createBitcoinLikeAccount(wallet, 0, P2PKH_MEDIUM_XPUB_INFO); - auto synchronize = [wallet, pool, this] (bool expectNewOp) { + auto synchronize = [wallet, pool, this] (std::shared_ptr context, bool expectNewOp) { auto account = uv::wait(wallet->getAccount(0)); auto numberOfOp = 0; @@ -271,7 +274,7 @@ TEST_F(BitcoinLikeWalletSynchronization, SynchronizeFromLastBlock) { }); auto eventBus = pool->getEventBus(); - eventBus->subscribe(getTestExecutionContext(),receiverNumberOp); + eventBus->subscribe(context, receiverNumberOp); auto bus = account->synchronize(); @@ -281,16 +284,18 @@ TEST_F(BitcoinLikeWalletSynchronization, SynchronizeFromLastBlock) { return; EXPECT_NE(event->getCode(), api::EventCode::SYNCHRONIZATION_FAILED); EXPECT_EQ(expectNewOp, (numberOfOp > 0)); - dispatcher->stop(); + context->stop(); }); - bus->subscribe(getTestExecutionContext(),receiver); + bus->subscribe(context,receiver); EXPECT_EQ(bus, account->synchronize()); - dispatcher->waitUntilStopped(); + context->waitUntilStopped(); return bus; }; - auto b1 = synchronize(true); - auto b2 = synchronize(false); + auto b1 = synchronize(std::dynamic_pointer_cast( + dispatcher->getSerialExecutionContext("__sync1__")), true); + auto b2 = synchronize(std::dynamic_pointer_cast( + dispatcher->getSerialExecutionContext("__sync2__")), false); EXPECT_NE(b1, b2); } } diff --git a/core/test/integration/transactions/bitcoin_P2PKH_transaction_tests.cpp b/core/test/integration/transactions/bitcoin_P2PKH_transaction_tests.cpp index 21aabd7a44..cad859d809 100644 --- a/core/test/integration/transactions/bitcoin_P2PKH_transaction_tests.cpp +++ b/core/test/integration/transactions/bitcoin_P2PKH_transaction_tests.cpp @@ -47,6 +47,7 @@ using namespace std; struct BitcoinMakeP2PKHTransaction : public BitcoinMakeBaseTransaction { void SetUpConfig() override { testData.configuration = DynamicObject::newInstance(); + testData.configuration->putString(api::Configuration::BLOCKCHAIN_EXPLORER_VERSION, "v3"); testData.walletName = "my_wallet"; testData.currencyName = "bitcoin"; testData.inflate_btc = ledger::testing::medium_xpub::inflate; @@ -79,6 +80,7 @@ struct BitcoinStardustTransaction : public BitcoinMakeBaseTransaction { .unit("satoshiStardust", 0, "SSD"); testData.configuration = DynamicObject::newInstance(); + testData.configuration->putString(api::Configuration::BLOCKCHAIN_EXPLORER_VERSION, "v3"); testData.walletName = "my_wallet"; testData.currencyName = "bitcoin_stardust"; testData.inflate_btc = ledger::testing::medium_xpub::inflate; diff --git a/core/test/integration/transactions/bitcoin_P2SH_transaction_tests.cpp b/core/test/integration/transactions/bitcoin_P2SH_transaction_tests.cpp index ac2523b140..223487d168 100644 --- a/core/test/integration/transactions/bitcoin_P2SH_transaction_tests.cpp +++ b/core/test/integration/transactions/bitcoin_P2SH_transaction_tests.cpp @@ -45,6 +45,7 @@ using namespace std; struct BitcoinMakeP2SHTransaction : public BitcoinMakeBaseTransaction { void SetUpConfig() override { testData.configuration = DynamicObject::newInstance(); + testData.configuration->putString(api::Configuration::BLOCKCHAIN_EXPLORER_VERSION, "v3"); testData.configuration->putString(api::Configuration::KEYCHAIN_ENGINE,api::KeychainEngines::BIP49_P2SH); testData.configuration->putString(api::Configuration::KEYCHAIN_DERIVATION_SCHEME,"49'/'/'//
"); testData.walletName = "my_wallet"; diff --git a/core/test/integration/transactions/coin_selection_P2PKH.cpp b/core/test/integration/transactions/coin_selection_P2PKH.cpp index 385397b273..181ff6c328 100644 --- a/core/test/integration/transactions/coin_selection_P2PKH.cpp +++ b/core/test/integration/transactions/coin_selection_P2PKH.cpp @@ -39,7 +39,8 @@ struct CoinSelectionP2PKH : public BitcoinMakeBaseTransaction { void SetUpConfig() override { testData.configuration = DynamicObject::newInstance(); testData.configuration->putString(api::Configuration::KEYCHAIN_ENGINE,api::KeychainEngines::BIP49_P2SH); - testData.configuration->putString(api::Configuration::KEYCHAIN_DERIVATION_SCHEME,"49'/'/'//
"); + testData.configuration->putString(api::Configuration::KEYCHAIN_DERIVATION_SCHEME,"49'/'/'//
"); + testData.configuration->putString(api::Configuration::BLOCKCHAIN_EXPLORER_VERSION, "v3"); testData.walletName = "my_wallet"; testData.currencyName = "bitcoin_testnet"; testData.inflate_btc = ledger::testing::coin_selection_xpub::inflate;