Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfixes related to switch statements #4250

Merged
merged 4 commits into from
May 26, 2020
Merged

Bugfixes related to switch statements #4250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
addf5be
Typo short-circuit boolean operator
dmos62 Apr 29, 2020
58db561
Fix forgotten break in switch statement #1
dmos62 Apr 29, 2020
a381cb2
Fix forgotten break in switch statement #2
dmos62 Apr 29, 2020
482d09e
Check if these *_MIN_AMOUNTs don't exceed 200k BSQ
dmos62 May 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions core/src/main/java/bisq/core/dao/governance/proposal/param/ChangeParamValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,15 @@ private void validateBsqValue(Coin currentParamValueAsCoin, Coin inputValueAsCoi
case PROPOSAL_FEE:
case BLIND_VOTE_FEE:
break;

case COMPENSATION_REQUEST_MIN_AMOUNT:
case REIMBURSEMENT_MIN_AMOUNT:
checkArgument(inputValueAsCoin.value >= Restrictions.getMinNonDustOutput().value,
Res.get("validation.amountBelowDust", Restrictions.getMinNonDustOutput().value));
case COMPENSATION_REQUEST_MAX_AMOUNT:
case REIMBURSEMENT_MAX_AMOUNT:
checkArgument(inputValueAsCoin.value >= Restrictions.getMinNonDustOutput().value,
Res.get("validation.amountBelowDust", Restrictions.getMinNonDustOutput().value));
checkArgument(inputValueAsCoin.value <= 200000000,
Res.get("validation.inputTooLarge", "200 000 BSQ"));
break;

case QUORUM_COMP_REQUEST:
case QUORUM_REIMBURSEMENT:
case QUORUM_CHANGE_PARAM:
Expand Down
1 change: 1 addition & 0 deletions core/src/main/java/bisq/core/dao/node/parser/TxOutputParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ private boolean isBtcOutputOfBurnFeeTx(TempTxOutput tempTxOutput) {
long blindVoteFee = daoStateService.getParamValueAsCoin(Param.BLIND_VOTE_FEE, tempTxOutput.getBlockHeight()).value;
return availableInputValue == blindVoteFee;
}
break;
case VOTE_REVEAL:
break;
case LOCKUP:
Expand Down
2 changes: 1 addition & 1 deletion p2p/src/main/java/bisq/network/p2p/network/Connection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" +
Expand Down