From fa2a94fc10c7901d29314d3404c012a544cfbc2a Mon Sep 17 00:00:00 2001 From: hzheng-ledger <71653044+hzheng-ledger@users.noreply.github.com> Date: Mon, 7 Jun 2021 13:19:32 +0200 Subject: [PATCH] Remove some log --- .../BlockchainExplorerAccountSynchronizer.cpp | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/core/src/wallet/bitcoin/synchronizers/BlockchainExplorerAccountSynchronizer.cpp b/core/src/wallet/bitcoin/synchronizers/BlockchainExplorerAccountSynchronizer.cpp index 1b1c2e1295..3dac59fe88 100644 --- a/core/src/wallet/bitcoin/synchronizers/BlockchainExplorerAccountSynchronizer.cpp +++ b/core/src/wallet/bitcoin/synchronizers/BlockchainExplorerAccountSynchronizer.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #define NEW_BENCHMARK(x) std::make_shared(fmt::format(x"/{}", buddy->synchronizationTag), buddy->logger) @@ -129,9 +128,7 @@ namespace ledger { markAddress(transaction.inputs); markAddress(transaction.outputs); } else { - std::cout << "account transaction intepretation begin" << std::endl; buddy->account->interpretTransaction(transaction, out); - std::cout << "account transaction intepretation end" << std::endl; } } @@ -376,7 +373,6 @@ namespace ledger { Future BlockchainExplorerAccountSynchronizer::performSynchronization(const std::shared_ptr& account) { - std::cout << "starting synchronization" << std::endl; auto buddy = makeSynchronizationBuddy(); buddy->account = account; buddy->preferences = std::static_pointer_cast(account)->getInternalPreferences() @@ -431,21 +427,16 @@ namespace ledger { } } } - std::cout << "initializeSavedState" << std::endl; initializeSavedState(buddy->savedState, buddy->halfBatchSize); - std::cout << "updateTransactionsToDrop" << std::endl; updateTransactionsToDrop(sql, buddy, account->getAccountUid()); - std::cout << "updateTransactionsToDrop finish" << std::endl; auto self = getSharedFromThis(); self->_addresses.clear(); self->_cachedTransactionBulks.clear(); self->_hashkeys.clear(); _explorerBenchmark = NEW_BENCHMARK("explorer_calls"); - std::cout << "updateCurrentBlock" << std::endl; return self->updateCurrentBlock(buddy).template flatMap(account->getContext(), [self, buddy](std::shared_ptr block) { soci::session sql(buddy->account->getWallet()->getDatabase()->getPool()); soci::transaction tr(sql); - std::cout << "putBlock" << std::endl; try { buddy->account->putBlock(sql, *block); tr.commit(); @@ -453,28 +444,21 @@ namespace ledger { catch (...) { tr.rollback(); } - std::cout << "extendKeychain" << std::endl; return self->extendKeychain(0, buddy); }).template flatMap>>(account->getContext(), [buddy, self](const Unit&) { self->_explorerBenchmark->start(); - std::cout << "requestTransactionsFromExplorer" << std::endl; return self->requestTransactionsFromExplorer(buddy);}) .template flatMap(account->getContext(), [buddy, self](const std::vector>& txBulks) { self->_explorerBenchmark->stop(); - std::cout << "insert transaction bulks" << std::endl; for (int i = 0; i < txBulks.size(); i++) { self->_cachedTransactionBulks.insert(std::make_pair(self->_hashkeys[i], txBulks[i])); } - std::cout << "synchronizeBatches" << std::endl; return self->synchronizeBatches(0, buddy); }).template flatMap(account->getContext(), [self, buddy](auto) { - std::cout << "synchronizeMempool" << std::endl; return self->synchronizeMempool(buddy); }).template map(ImmediateExecutionContext::INSTANCE, [self, buddy](const Unit&) { - std::cout << "duration" << std::endl; auto duration = std::chrono::duration_cast( (DateUtils::now() - buddy->startDate.time_since_epoch()).time_since_epoch()); - std::cout << "End synchronization" << std::endl; buddy->logger->info("End synchronization for account#{} of wallet {} in {}", buddy->account->getIndex(), buddy->account->getWallet()->getName(), DurationUtils::formatDuration(duration)); auto const& batches = buddy->savedState.getValue().batches; @@ -493,11 +477,9 @@ namespace ledger { buddy->wallet->getCurrency().name).template map([](const Block& block) { return block.height; }).getValueOr(0); - std::cout << "End!!" << std::endl; self->_currentAccount = nullptr; return buddy->context; }).recover(ImmediateExecutionContext::INSTANCE, [self, buddy](const Exception& ex) { - std::cout << "Error synchronization" << std::endl; auto duration = std::chrono::duration_cast( (DateUtils::now() - buddy->startDate.time_since_epoch()).time_since_epoch()); buddy->logger->error("Error during during synchronization for account#{} of wallet {} in {} ms", buddy->account->getIndex(), @@ -704,7 +686,6 @@ namespace ledger { Option lastBlock = Option::NONE; std::vector operations; interpretBenchmark->start(); - std::cout << "transaction intepretation1" << std::endl; // Interpret transactions to operations and update last block for (const auto& tx : bulk->transactions) { // Update last block to chain query @@ -712,9 +693,7 @@ namespace ledger { lastBlock.getValue().height < tx.block.getValue().height) { lastBlock = tx.block; } - std::cout << "transaction intepretation begin" << std::endl; self->interpretTransaction(tx, buddy, operations); - std::cout << "transaction intepretation end" << std::endl; //Update first pendingTxHash in savedState auto it = buddy->transactionsToDrop.find(tx.hash); if (it != buddy->transactionsToDrop.end()) { @@ -729,12 +708,10 @@ namespace ledger { //Remove from tx to drop buddy->transactionsToDrop.erase(tx.hash); } - std::cout << "transaction intepretation finish" << std::endl; interpretBenchmark->stop(); auto insertionBenchmark = NEW_BENCHMARK("insert_operations"); insertionBenchmark->start(); Try tryPutTx = buddy->account->bulkInsert(operations); - std::cout << "insert transaction finish" << std::endl; insertionBenchmark->stop(); if (tryPutTx.isFailure()) { buddy->logger->error("Failed to bulk insert for batch {} because: {}", currentBatchIndex, tryPutTx.getFailure().getMessage());