adapt to gradido unit changes

einhornimmond · einhornimmond · commit 459935ff1a62 · 2025-01-06T12:09:24.000+01:00
diff --git a/dependencies/gradido_blockchain b/dependencies/gradido_blockchain
@@ -1 +1 @@
-Subproject commit 1427c17e72a179ab61e11844c87b21c76df150d5
+Subproject commit 8f9c042d66ab4a4ca499ee245409b6d8ecb4632f
diff --git a/src/model/Apollo/Transaction.cpp b/src/model/Apollo/Transaction.cpp
@@ -36,7 +36,7 @@ namespace model {
 				else if (transfer->getSender().getPublicKey()->isTheSame(pubkey)) {
 					mType = TransactionType::SEND;
 					mPubkey = transfer->getRecipient()->convertToHex();
-					mAmount *= GradidoUnit((int64_t)-1);
+					mAmount.negate();
 				}				
 			}
 			else if (transactionBody->getTransactionType() == gradido::data::TransactionType::DEFERRED_TRANSFER) {
@@ -49,7 +49,7 @@ namespace model {
 				else if (transfer.getSender().getPublicKey()->isTheSame(pubkey)) {
 					mType = TransactionType::LINK_SEND;
 					mPubkey = transfer.getRecipient()->convertToHex();
-					mAmount *= GradidoUnit((int64_t)-1);
+					mAmount.negate();
 				}
 			}
 			else {
diff --git a/src/model/Apollo/TransactionList.cpp b/src/model/Apollo/TransactionList.cpp
@@ -52,7 +52,7 @@ namespace model {
 			}
 			
 			// all transaction is always sorted ASC, regardless of filter.searchDirection value
-			GradidoUnit previousBalance(0ll);
+			GradidoUnit previousBalance(GradidoUnit::zero());
 			for (auto& entry: allTransactionsVector)
 			{
 				auto confirmedTransaction = entry->getConfirmedTransaction();

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ namespace model {`
`36`	`36`	`else if (transfer->getSender().getPublicKey()->isTheSame(pubkey)) {`
`37`	`37`	`mType = TransactionType::SEND;`
`38`	`38`	`mPubkey = transfer->getRecipient()->convertToHex();`
`39`		`- mAmount *= GradidoUnit((int64_t)-1);`
	`39`	`+ mAmount.negate();`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`else if (transactionBody->getTransactionType() == gradido::data::TransactionType::DEFERRED_TRANSFER) {`
`@@ -49,7 +49,7 @@ namespace model {`
`49`	`49`	`else if (transfer.getSender().getPublicKey()->isTheSame(pubkey)) {`
`50`	`50`	`mType = TransactionType::LINK_SEND;`
`51`	`51`	`mPubkey = transfer.getRecipient()->convertToHex();`
`52`		`- mAmount *= GradidoUnit((int64_t)-1);`
	`52`	`+ mAmount.negate();`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ namespace model {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// all transaction is always sorted ASC, regardless of filter.searchDirection value`
`55`		`- GradidoUnit previousBalance(0ll);`
	`55`	`+ GradidoUnit previousBalance(GradidoUnit::zero());`
`56`	`56`	`for (auto& entry: allTransactionsVector)`
`57`	`57`	`{`
`58`	`58`	`auto confirmedTransaction = entry->getConfirmedTransaction();`