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

Rename getMiningFeeAndTxSize to getBlindVoteMiningFeeAndTxSize

Browse Source
This commit is contained in:
Manfred Karrer 2019-03-18 18:22:19 -05:00
parent c8b0e88dba
commit 3d5e109b82
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/bisq/core/dao/DaoFacade.java
View File

@ -362,7 +362,7 @@ public class DaoFacade implements DaoSetupService {
return BlindVoteConsensus.getFee(daoStateService, daoStateService.getChainHeight()); return BlindVoteConsensus.getFee(daoStateService, daoStateService.getChainHeight());
} }
public Tuple2<Coin, Integer> getMiningFeeAndTxSize(Coin stake) public Tuple2<Coin, Integer> getBlindVoteMiningFeeAndTxSize(Coin stake)
throws WalletException, InsufficientMoneyException, TransactionVerificationException { throws WalletException, InsufficientMoneyException, TransactionVerificationException {
return myBlindVoteListService.getMiningFeeAndTxSize(stake); return myBlindVoteListService.getMiningFeeAndTxSize(stake);
} }

8
desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java
View File

@ -31,7 +31,6 @@ import bisq.desktop.components.TxIdTextField;
import bisq.desktop.main.dao.governance.PhasesView; import bisq.desktop.main.dao.governance.PhasesView;
import bisq.desktop.main.dao.governance.ProposalDisplay; import bisq.desktop.main.dao.governance.ProposalDisplay;
import bisq.desktop.main.overlays.popups.Popup; import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.main.overlays.windows.DAOTestingFeedbackWindow;
import bisq.desktop.util.GUIUtil; import bisq.desktop.util.GUIUtil;
import bisq.desktop.util.Layout; import bisq.desktop.util.Layout;
import bisq.desktop.util.validation.BsqValidator; import bisq.desktop.util.validation.BsqValidator;
@ -49,17 +48,14 @@ import bisq.core.dao.state.DaoStateService;
import bisq.core.dao.state.model.blockchain.Block; import bisq.core.dao.state.model.blockchain.Block;
import bisq.core.dao.state.model.governance.Ballot; import bisq.core.dao.state.model.governance.Ballot;
import bisq.core.dao.state.model.governance.DaoPhase; import bisq.core.dao.state.model.governance.DaoPhase;
import bisq.core.dao.state.model.governance.DecryptedBallotsWithMerits;
import bisq.core.dao.state.model.governance.EvaluatedProposal; import bisq.core.dao.state.model.governance.EvaluatedProposal;
import bisq.core.dao.state.model.governance.Proposal; import bisq.core.dao.state.model.governance.Proposal;
import bisq.core.dao.state.model.governance.Vote; import bisq.core.dao.state.model.governance.Vote;
import bisq.core.locale.Res; import bisq.core.locale.Res;
import bisq.core.user.DontShowAgainLookup;
import bisq.core.user.Preferences; import bisq.core.user.Preferences;
import bisq.core.util.BSFormatter; import bisq.core.util.BSFormatter;
import bisq.core.util.BsqFormatter; import bisq.core.util.BsqFormatter;
import bisq.common.UserThread;
import bisq.common.app.DevEnv; import bisq.common.app.DevEnv;
import bisq.common.util.Tuple2; import bisq.common.util.Tuple2;
import bisq.common.util.Tuple3; import bisq.common.util.Tuple3;
@ -67,7 +63,6 @@ import bisq.common.util.Tuple4;
import org.bitcoinj.core.Coin; import org.bitcoinj.core.Coin;
import org.bitcoinj.core.InsufficientMoneyException; import org.bitcoinj.core.InsufficientMoneyException;
import org.bitcoinj.core.Transaction;
import javax.inject.Inject; import javax.inject.Inject;
@ -106,7 +101,6 @@ import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -506,7 +500,7 @@ public class ProposalsView extends ActivatableView<GridPane, Void> implements Bs
Coin stake = bsqFormatter.parseToCoin(stakeInputTextField.getText()); Coin stake = bsqFormatter.parseToCoin(stakeInputTextField.getText());
try { try {
// We create a dummy tx to get the miningFee for displaying it at the confirmation popup // We create a dummy tx to get the miningFee for displaying it at the confirmation popup
Tuple2<Coin, Integer> miningFeeAndTxSize = daoFacade.getMiningFeeAndTxSize(stake); Tuple2<Coin, Integer> miningFeeAndTxSize = daoFacade.getBlindVoteMiningFeeAndTxSize(stake);
Coin miningFee = miningFeeAndTxSize.first; Coin miningFee = miningFeeAndTxSize.first;
int txSize = miningFeeAndTxSize.second; int txSize = miningFeeAndTxSize.second;
Coin blindVoteFee = daoFacade.getBlindVoteFeeForCycle(); Coin blindVoteFee = daoFacade.getBlindVoteFeeForCycle();