Format Transaction.java (and dependent code)

damccull · Apr 4, 2024 · 2185735 · 2185735
1 parent f9fe720
commit 2185735
Show file tree

Hide file tree

Showing 12 changed files with 720 additions and 675 deletions.
diff --git a/src/brs/BlockchainProcessorImpl.java b/src/brs/BlockchainProcessorImpl.java
@@ -1080,7 +1080,7 @@ private void pushBlock(final Block block) throws BlockNotAcceptedException {
                             logger.debug(
                                     "Block {} height {} contains transaction that was generated on a fork: {} ecBlockId {} ecBlockHeight {}",
                                     block.getStringId(), previousLastBlock.getHeight() + 1, transaction.getStringId(),
-                                    transaction.getECBlockHeight(), Convert.toUnsignedLong(transaction.getECBlockId()));
+                                    transaction.getEcBlockHeight(), Convert.toUnsignedLong(transaction.getEcBlockId()));
                         }
                         throw new TransactionNotAcceptedException("Transaction belongs to a different fork",
                                 transaction);
@@ -1108,11 +1108,11 @@ private void pushBlock(final Block block) throws BlockNotAcceptedException {
                         throw new TransactionNotAcceptedException(e.getMessage(), transaction);
                     }
 
-                    calculatedTotalAmount += transaction.getAmountNQT();
-                    calculatedTotalFee += transaction.getFeeNQT();
+                    calculatedTotalAmount += transaction.getAmountNqt();
+                    calculatedTotalFee += transaction.getFeeNqt();
                     digest.update(transaction.getBytes());
                     indirectIncomingService.processTransaction(transaction);
-                    feeArray[slotIdx] = transaction.getFeeNQT();
+                    feeArray[slotIdx] = transaction.getFeeNqt();
                     slotIdx += 1;
                 }
 
@@ -1375,7 +1375,7 @@ public void generateBlock(String secretPhrase, byte[] publicKey, Long nonce) thr
                         age = 1;
                     }
 
-                    long feePriority = transaction.getFeeNQT()
+                    long feePriority = transaction.getFeeNqt()
                             * (transaction.getSize() / Constants.ORDINARY_TRANSACTION_BYTES);
                     // So the age has less priority (60 minutes to increase the priority to the next
                     // level)
@@ -1407,7 +1407,7 @@ public void generateBlock(String secretPhrase, byte[] publicKey, Long nonce) thr
                     Map<Long, TreeMap<Long, Transaction>> unconfirmedTransactionsOrderedBySlotThenPriority = new HashMap<>();
                     inclusionCandidates.collect(Collectors.toMap(Function.identity(), priorityCalculator::applyAsLong))
                             .forEach((transaction, priority) -> {
-                                long slot = (transaction.getFeeNQT() - (transaction.getFeeNQT() % FEE_QUANT_SIP3))
+                                long slot = (transaction.getFeeNqt() - (transaction.getFeeNqt() % FEE_QUANT_SIP3))
                                         / FEE_QUANT_SIP3;
                                 slot = Math.min(Signum.getFluxCapacitor().getValue(FluxValues.MAX_NUMBER_TRANSACTIONS),
                                         slot);
@@ -1498,15 +1498,15 @@ public int compare(Transaction t1, Transaction t2) {
                         // we already got the list by priority, no need to check the fees again
                         slotFee = feeQuant;
                     }
-                    if (transaction.getFeeNQT() >= slotFee) {
+                    if (transaction.getFeeNqt() >= slotFee) {
                         if (transactionService.applyUnconfirmed(transaction)) {
                             try {
                                 transactionService.validate(transaction);
                                 payloadSize -= transaction.getSize();
-                                totalAmountNqt += transaction.getAmountNQT();
-                                totalFeeNqt += transaction.getFeeNQT();
+                                totalAmountNqt += transaction.getAmountNqt();
+                                totalFeeNqt += transaction.getFeeNqt();
                                 if (Signum.getFluxCapacitor().getValue(FluxValues.SMART_FEES, blockHeight)) {
-                                    totalFeeCashBackNqt += transaction.getFeeNQT()
+                                    totalFeeCashBackNqt += transaction.getFeeNqt()
                                             / propertyService.getInt(Props.CASH_BACK_FACTOR);
                                 }
                                 orderedBlockTransactions.add(transaction);

diff --git a/src/brs/DebugTrace.java b/src/brs/DebugTrace.java
@@ -204,8 +204,8 @@ private Map<String,String> getValues(long accountId, Trade trade, boolean isAsk)
   }
 
   private Map<String,String> getValues(long accountId, Transaction transaction, boolean isRecipient) {
-    long amount = transaction.getAmountNQT();
-    long fee = transaction.getFeeNQT();
+    long amount = transaction.getAmountNqt();
+    long fee = transaction.getFeeNqt();
     if (isRecipient) {
       fee = 0; // fee doesn't affect recipient account
     } else {

diff --git a/src/brs/EconomicClustering.java b/src/brs/EconomicClustering.java
@@ -51,11 +51,11 @@ public boolean verifyFork(Transaction transaction) {
         // TODO: remove this conditional above in the future, do the EC check regardless of a full hash reference
         return true;
       }
-      if (blockchain.getHeight() < Constants.EC_CHANGE_BLOCK_1 && blockchain.getHeight() - transaction.getECBlockHeight() > Constants.EC_BLOCK_DISTANCE_LIMIT) {
+      if (blockchain.getHeight() < Constants.EC_CHANGE_BLOCK_1 && blockchain.getHeight() - transaction.getEcBlockHeight() > Constants.EC_BLOCK_DISTANCE_LIMIT) {
         return false;
       }
-      Block ecBlock = blockchain.getBlock(transaction.getECBlockId());
-      return ecBlock != null && ecBlock.getHeight() == transaction.getECBlockHeight();
+      Block ecBlock = blockchain.getBlock(transaction.getEcBlockId());
+      return ecBlock != null && ecBlock.getHeight() == transaction.getEcBlockHeight();
     }
     catch ( NullPointerException e ) {
       if (logger.isDebugEnabled()) {