From 7e67d65eb0dcef605f703aaca863df08788bf24b Mon Sep 17 00:00:00 2001
From: HenrikJannsen <boilingfrog@gmx.com>
Date: Sun, 4 Dec 2022 14:18:03 -0500
Subject: [PATCH] Fix merge error, Cleanup

---
 core/src/main/java/bisq/core/dao/node/full/RpcService.java  | 6 +++---
 .../bisq/core/dao/burningman/BurningManServiceTest.java     | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/bisq/core/dao/node/full/RpcService.java b/core/src/main/java/bisq/core/dao/node/full/RpcService.java
index 801cd7f8252..d7e557db389 100644
--- a/core/src/main/java/bisq/core/dao/node/full/RpcService.java
+++ b/core/src/main/java/bisq/core/dao/node/full/RpcService.java
@@ -285,13 +285,13 @@ private void setupBlockHandler() {
                 if (rawDtoBlockHandler != null) {
                     UserThread.execute(() -> rawDtoBlockHandler.accept(rawDtoBlock));
                 }
-            } catch (Throwable throwablet) {
+            } catch (Throwable throwable) {
                 log.error("Error at BlockHandler", throwable);
                 if (rawBlockErrorHandler != null) {
-                    rawBlockErrorHandler.accept(t);
+                    rawBlockErrorHandler.accept(throwable);
                 }
                 if (rawDtoBlockErrorHandler != null) {
-                    rawDtoBlockErrorHandler.accept(t);
+                    rawDtoBlockErrorHandler.accept(throwable);
                 }
             }
         });
diff --git a/core/src/test/java/bisq/core/dao/burningman/BurningManServiceTest.java b/core/src/test/java/bisq/core/dao/burningman/BurningManServiceTest.java
index a103af81f3f..09c68527f4b 100644
--- a/core/src/test/java/bisq/core/dao/burningman/BurningManServiceTest.java
+++ b/core/src/test/java/bisq/core/dao/burningman/BurningManServiceTest.java
@@ -32,7 +32,6 @@ public void testGetDecayedAmount() {
         long amount = 100;
         int currentBlockHeight = 1400;
         int fromBlockHeight = 1000;
-        int heightOfFirstBlockOfCurrentCycle = 1400;
         assertEquals(0, BurningManService.getDecayedAmount(amount, 1000, currentBlockHeight, fromBlockHeight));
         assertEquals(25, BurningManService.getDecayedAmount(amount, 1100, currentBlockHeight, fromBlockHeight));
         assertEquals(50, BurningManService.getDecayedAmount(amount, 1200, currentBlockHeight, fromBlockHeight));