From ecf2a3a407bd97749c0f5b36d67f985814fa7b6f Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 4 Feb 2021 13:26:01 +0100 Subject: [PATCH] remove debug printf and add transaction type to string function for both hedera and gradido transactions --- src/cpp/model/gradido/Transaction.cpp | 16 +++++++++------- src/cpp/model/gradido/TransactionBody.cpp | 12 ++++++++++++ src/cpp/model/gradido/TransactionBody.h | 1 + src/cpp/model/hedera/TransactionBody.cpp | 13 ++++++++++++- src/cpp/model/hedera/TransactionBody.h | 1 + 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/cpp/model/gradido/Transaction.cpp b/src/cpp/model/gradido/Transaction.cpp index fae357e04..2207da9e7 100644 --- a/src/cpp/model/gradido/Transaction.cpp +++ b/src/cpp/model/gradido/Transaction.cpp @@ -304,7 +304,7 @@ namespace model { auto sigBytes = sigPair->mutable_ed25519(); *sigBytes = std::string((char*)*sign, crypto_sign_BYTES); auto sign_hex_string = DataTypeConverter::binToHex(sign); - printf("sign hex: %s\n", sign_hex_string.data()); + //printf("sign hex: %s\n", sign_hex_string.data()); mm->releaseMemory(sign); updateRequestInDB(); @@ -323,7 +323,7 @@ namespace model { } //getModel()->updateIntoDB("request", ) - printf("[Transaction::sign] reference-count: %d\n", mReferenceCount); + //printf("[Transaction::sign] reference-count: %d\n", mReferenceCount); return true; } @@ -570,8 +570,10 @@ namespace model { auto hedera_precheck_code_string = hedera_transaction_response->getPrecheckCodeString(); auto precheck_code = hedera_transaction_response->getPrecheckCode(); auto cost = hedera_transaction_response->getCost(); - - printf("hedera response: %s, cost: %" PRIu64 "\n", hedera_precheck_code_string.data(), cost); + + printf("hedera response: %s, cost: %" PRIu64 ", type: %s\n", + hedera_precheck_code_string.data(), cost, + TransactionBody::transactionTypeToString(mTransactionBody->getType())); if (precheck_code == proto::INVALID_TRANSACTION_START) { int zahl = 0; return -5; @@ -583,8 +585,8 @@ namespace model { // trigger community server update in 5 seconds Poco::DateTime now; std::string now_string = Poco::DateTimeFormatter::format(now, "%f.%m.%Y %H:%M:%S"); - printf("[%s] trigger community server update in 5 second, now: %s\n", function_name, now_string.data()); - CronManager::getInstance()->scheduleUpdateRun(Poco::Timespan(5000, 0)); + //printf("[%s] trigger community server update in 5 second, now: %s\n", function_name, now_string.data()); + CronManager::getInstance()->scheduleUpdateRun(Poco::Timespan(5, 0)); return 1; } @@ -686,7 +688,7 @@ namespace model { return 0; }*/ result = mTransaction->runSendTransaction(); - printf("[SendTransactionTask::run] result: %d\n", result); + //printf("[SendTransactionTask::run] result: %d\n", result); // delete because of error if (-1 == result) { mTransaction->deleteFromDB(); diff --git a/src/cpp/model/gradido/TransactionBody.cpp b/src/cpp/model/gradido/TransactionBody.cpp index a59634b4d..3859ef969 100644 --- a/src/cpp/model/gradido/TransactionBody.cpp +++ b/src/cpp/model/gradido/TransactionBody.cpp @@ -172,6 +172,18 @@ namespace model { return ""; } + const char* TransactionBody::transactionTypeToString(TransactionType type) + { + switch (type) + { + case model::gradido::TRANSACTION_NONE: return "NONE"; + case model::gradido::TRANSACTION_CREATION: return "Creation"; + case model::gradido::TRANSACTION_TRANSFER: return "Transfer"; + case model::gradido::TRANSACTION_GROUP_MEMBER_UPDATE: return "Group Member Update"; + } + return ""; + } + TransactionCreation* TransactionBody::getCreationTransaction() diff --git a/src/cpp/model/gradido/TransactionBody.h b/src/cpp/model/gradido/TransactionBody.h index 784644ee5..9d026ecf9 100644 --- a/src/cpp/model/gradido/TransactionBody.h +++ b/src/cpp/model/gradido/TransactionBody.h @@ -41,6 +41,7 @@ namespace model { static Poco::AutoPtr load(const std::string& protoMessageBin); inline TransactionType getType() { Poco::ScopedLock _lock(mWorkMutex); return mType; } + static const char* transactionTypeToString(TransactionType type); std::string getMemo(); void setMemo(const std::string& memo); diff --git a/src/cpp/model/hedera/TransactionBody.cpp b/src/cpp/model/hedera/TransactionBody.cpp index c50567a1e..291dd5542 100644 --- a/src/cpp/model/hedera/TransactionBody.cpp +++ b/src/cpp/model/hedera/TransactionBody.cpp @@ -113,6 +113,17 @@ namespace model { return false; } + const char* TransactionBody::TransactionBodyTypeToString(TransactionBodyType type) + { + switch (type) { + case TRANSACTION_CONSENSUS_CREATE_TOPIC: return "Consensus Create Topic"; + case TRANSACTION_CONSENSUS_SUBMIT_MESSAGE: return "Consensus Submit Message"; + case TRANSACTION_CRYPTO_CREATE: return "Crypto Create"; + case TRANSACTION_CRYPTO_TRANSFER: return "Crypto Transfer"; + } + return ""; + } + void TransactionBody::setMemo(const std::string& memo) { mTransactionBody.set_memo(memo); @@ -136,7 +147,7 @@ namespace model { timestamp->set_nanos(microseconds * 1000); // make sure timestamp is some nanos old //timestamp->set_nanos(microseconds * 900); - printf("hedera transaction body timestamp: %d.%d\n", timestamp->seconds(), timestamp->nanos()); + // printf("hedera transaction body timestamp: %d.%d\n", timestamp->seconds(), timestamp->nanos()); } } } \ No newline at end of file diff --git a/src/cpp/model/hedera/TransactionBody.h b/src/cpp/model/hedera/TransactionBody.h index 7697434ec..b9c25d0c4 100644 --- a/src/cpp/model/hedera/TransactionBody.h +++ b/src/cpp/model/hedera/TransactionBody.h @@ -50,6 +50,7 @@ namespace model { inline std::string getConnectionString() const { return mConnection.getUriWithPort(); } inline controller::NodeServerConnection getConnection() const { return mConnection; } inline TransactionBodyType getType() const { return mType; } + static const char* TransactionBodyTypeToString(TransactionBodyType type); void updateTimestamp(); protected: