mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Bugfix and typofix"

Browse Source
This commit is contained in:
sqrrm 2020-05-05 18:08:00 +02:00 committed by GitHub
parent 55c5ac02fc
commit 3f3ee0a096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/bisq/core/dao/governance/proposal/param/ChangeParamValidator.java
View File

@ -144,7 +144,6 @@ public class ChangeParamValidator extends ProposalValidator implements Consensus
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,

7
core/src/main/java/bisq/core/dao/node/parser/TxOutputParser.java
View File

@ -271,12 +271,12 @@ class TxOutputParser {
// If it is the vote stake output we return false.
if (index == 0) {
break;
return false;
}
// There must be a vote fee left
if (availableInputValue <= 0) {
break;
return false;
}
// Burned BSQ output is last output before opReturn.
@ -285,7 +285,7 @@ class TxOutputParser {
// We always have the BSQ change before the burned BSQ output if both are present.
checkArgument(optionalOpReturnIndex.isPresent());
if (index != optionalOpReturnIndex.get() - 1) {
break;
return false;
}
// Without checking the fee we would not be able to distinguish between 2 structurally same transactions, one
@ -293,7 +293,6 @@ class TxOutputParser {
long blindVoteFee = daoStateService.getParamValueAsCoin(Param.BLIND_VOTE_FEE, tempTxOutput.getBlockHeight()).value;
return availableInputValue == blindVoteFee;
}
break;
case VOTE_REVEAL:
break;
case LOCKUP:

2
p2p/src/main/java/bisq/network/p2p/network/Connection.java
View File

@ -235,7 +235,7 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
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" +