mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor: Rename getIssuanceSet to getIssuanceSetForType

Browse source
This commit is contained in:
chimp1984 2020-12-27 21:21:48 -05:00
parent 686957c809
commit 32cc062872
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
4 changed files with 7 additions and 7 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

@ -631,7 +631,7 @@ public class DaoFacade implements DaoSetupService {
}
public int getNumIssuanceTransactions(IssuanceType issuanceType) {
return daoStateService.getIssuanceSet(issuanceType).size();
return daoStateService.getIssuanceSetForType(issuanceType).size();
}
public Set<Tx> getBurntFeeTxs() {

2
core/src/main/java/bisq/core/dao/governance/blindvote/MyBlindVoteListService.java
View file

@ -286,7 +286,7 @@ public class MyBlindVoteListService implements PersistedDataHost, DaoStateListen
.filter(txId -> periodService.isTxInPastCycle(txId, periodService.getChainHeight()))
.collect(Collectors.toSet());
return new MeritList(daoStateService.getIssuanceSet(IssuanceType.COMPENSATION).stream()
return new MeritList(daoStateService.getIssuanceSetForType(IssuanceType.COMPENSATION).stream()
.map(issuance -> {
checkArgument(issuance.getIssuanceType() == IssuanceType.COMPENSATION,
"IssuanceType must be COMPENSATION for MeritList");

2
core/src/main/java/bisq/core/dao/state/DaoStateService.java
View file

@ -597,7 +597,7 @@ public class DaoStateService implements DaoSetupService {
daoState.getIssuanceMap().put(issuance.getTxId(), issuance);
}
public Set<Issuance> getIssuanceSet(IssuanceType issuanceType) {
public Set<Issuance> getIssuanceSetForType(IssuanceType issuanceType) {
return daoState.getIssuanceMap().values().stream()
.filter(issuance -> issuance.getIssuanceType() == issuanceType)
.collect(Collectors.toSet());

8
desktop/src/main/java/bisq/desktop/main/dao/economy/supply/SupplyView.java
View file

@ -61,8 +61,6 @@ import javafx.collections.ListChangeListener;
import javafx.util.StringConverter;
import java.text.DecimalFormat;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
@ -73,6 +71,8 @@ import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjuster;
import java.time.temporal.TemporalAdjusters;
import java.text.DecimalFormat;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
@ -630,10 +630,10 @@ public class SupplyView extends ActivatableView<GridPane, Void> implements DaoSt
.toLocalDate()
.with(ADJUSTERS.get(MONTH)));
Stream<Issuance> bsqByCompensation = daoStateService.getIssuanceSet(IssuanceType.COMPENSATION).stream()
Stream<Issuance> bsqByCompensation = daoStateService.getIssuanceSetForType(IssuanceType.COMPENSATION).stream()
.sorted(Comparator.comparing(Issuance::getChainHeight));
Stream<Issuance> bsqByReimbursement = daoStateService.getIssuanceSet(IssuanceType.REIMBURSEMENT).stream()
Stream<Issuance> bsqByReimbursement = daoStateService.getIssuanceSetForType(IssuanceType.REIMBURSEMENT).stream()
.sorted(Comparator.comparing(Issuance::getChainHeight));
Map<LocalDate, List<Issuance>> bsqAddedByVote = Stream.concat(bsqByCompensation, bsqByReimbursement)