From db73afaf88d0d9920ee03a695b8f35a7e8533ba9 Mon Sep 17 00:00:00 2001
From: catbref <misc-github@talk2dom.com>
Date: Mon, 25 May 2020 07:27:42 +0100
Subject: [PATCH] Remove Block.orphan() forced repository debugging

---
 src/main/java/org/qortal/block/Block.java | 47 ++++++++++-------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/qortal/block/Block.java b/src/main/java/org/qortal/block/Block.java
index f7dde924..cf19016c 100644
--- a/src/main/java/org/qortal/block/Block.java
+++ b/src/main/java/org/qortal/block/Block.java
@@ -1450,39 +1450,34 @@ public class Block {
 	public void orphan() throws DataException {
 		LOGGER.trace(() -> String.format("Orphaning block %d", this.blockData.getHeight()));
 
-		this.repository.setDebug(true);
-		try {
-			// Return AT fees and delete AT states from repository
-			orphanAtFeesAndStates();
+		// Return AT fees and delete AT states from repository
+		orphanAtFeesAndStates();
 
-			// Orphan, and unlink, transactions from this block
-			orphanTransactionsFromBlock();
+		// Orphan, and unlink, transactions from this block
+		orphanTransactionsFromBlock();
 
-			// Undo any group-approval decisions that happen at this block
-			orphanGroupApprovalTransactions();
+		// Undo any group-approval decisions that happen at this block
+		orphanGroupApprovalTransactions();
 
-			if (this.blockData.getHeight() > 1) {
-				// Invalidate expandedAccounts as they may have changed due to orphaning TRANSFER_PRIVS transactions, etc.
-				this.cachedExpandedAccounts = null;
+		if (this.blockData.getHeight() > 1) {
+			// Invalidate expandedAccounts as they may have changed due to orphaning TRANSFER_PRIVS transactions, etc.
+			this.cachedExpandedAccounts = null;
 
-				// Deduct any transaction fees from minter/reward-share account(s)
-				deductTransactionFees();
+			// Deduct any transaction fees from minter/reward-share account(s)
+			deductTransactionFees();
 
-				// Block rewards removed after transactions undone
-				orphanBlockRewards();
+			// Block rewards removed after transactions undone
+			orphanBlockRewards();
 
-				// Decrease account levels
-				decreaseAccountLevels();
-			}
-
-			// Delete block from blockchain
-			this.repository.getBlockRepository().delete(this.blockData);
-			this.blockData.setHeight(null);
-
-			postBlockTidy();
-		} finally {
-			this.repository.setDebug(false);
+			// Decrease account levels
+			decreaseAccountLevels();
 		}
+
+		// Delete block from blockchain
+		this.repository.getBlockRepository().delete(this.blockData);
+		this.blockData.setHeight(null);
+
+		postBlockTidy();
 	}
 
 	protected void orphanTransactionsFromBlock() throws DataException {