Skip to content

Commit

Permalink
Fix merge error, Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
HenrikJannsen committed Dec 4, 2022
1 parent 4dfb748 commit 7e67d65
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions core/src/main/java/bisq/core/dao/node/full/RpcService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 7e67d65

Please sign in to comment.