Merge pull request #4212 from dmos62/bugfix-and-typofix

Bugfix and typofix
bisq-network · May 5, 2020 · 5e9bbfc · 5e9bbfc
2 parents a731957 + fb76fd6
commit 5e9bbfc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/core/src/main/java/bisq/core/dao/governance/proposal/param/ChangeParamValidator.java b/core/src/main/java/bisq/core/dao/governance/proposal/param/ChangeParamValidator.java
@@ -144,6 +144,7 @@ private void validateBsqValue(Coin currentParamValueAsCoin, Coin inputValueAsCoi
             case REIMBURSEMENT_MIN_AMOUNT:
                 checkArgument(inputValueAsCoin.value >= Restrictions.getMinNonDustOutput().value,
                         Res.get("validation.amountBelowDust", Restrictions.getMinNonDustOutput().value));
+                break;
             case COMPENSATION_REQUEST_MAX_AMOUNT:
             case REIMBURSEMENT_MAX_AMOUNT:
                 checkArgument(inputValueAsCoin.value >= Restrictions.getMinNonDustOutput().value,

diff --git a/core/src/main/java/bisq/core/dao/node/parser/TxOutputParser.java b/core/src/main/java/bisq/core/dao/node/parser/TxOutputParser.java
@@ -271,12 +271,12 @@ private boolean isBtcOutputOfBurnFeeTx(TempTxOutput tempTxOutput) {
 
                         // If it is the vote stake output we return false.
                         if (index == 0) {
-                            return false;
+                            break;
                         }
 
                         // There must be a vote fee left
                         if (availableInputValue <= 0) {
-                            return false;
+                            break;
                         }
 
                         // Burned BSQ output is last output before opReturn.
@@ -285,14 +285,15 @@ private boolean isBtcOutputOfBurnFeeTx(TempTxOutput tempTxOutput) {
                         // We always have the BSQ change before the burned BSQ output if both are present.
                         checkArgument(optionalOpReturnIndex.isPresent());
                         if (index != optionalOpReturnIndex.get() - 1) {
-                            return false;
+                            break;
                         }
 
                         // Without checking the fee we would not be able to distinguish between 2 structurally same transactions, one
                         // where the output is burned BSQ and one where it is a BSQ change output.
                         long blindVoteFee = daoStateService.getParamValueAsCoin(Param.BLIND_VOTE_FEE, tempTxOutput.getBlockHeight()).value;
                         return availableInputValue == blindVoteFee;
                     }
+                    break;
                 case VOTE_REVEAL:
                     break;
                 case LOCKUP:

diff --git a/p2p/src/main/java/bisq/network/p2p/network/Connection.java b/p2p/src/main/java/bisq/network/p2p/network/Connection.java
@@ -235,7 +235,7 @@ public void sendMessage(NetworkEnvelope networkEnvelope) {
                     protobuf.NetworkEnvelope proto = networkEnvelope.toProtoNetworkEnvelope();
                     log.trace("Sending message: {}", Utilities.toTruncatedString(proto.toString(), 10000));
 
-                    if (networkEnvelope instanceof Ping | networkEnvelope instanceof RefreshOfferMessage) {
+                    if (networkEnvelope instanceof Ping || networkEnvelope instanceof RefreshOfferMessage) {
                         // pings and offer refresh msg we don't want to log in production
                         log.trace("\n\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" +
                                         "Sending direct message to peer" +