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

Fix merge errors

Browse Source
This commit is contained in:
Manfred Karrer 2018-10-31 13:23:38 -05:00
parent a8b833c285
commit e14508055c
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/bisq/core/dao/bonding/bond/BondedReputation.java
View File

@ -18,7 +18,7 @@
package bisq.core.dao.bonding.bond;
import bisq.core.dao.DaoFacade;
import bisq.core.dao.state.BsqStateService;
import bisq.core.dao.state.DaoStateService;
import bisq.core.locale.Res;
import bisq.common.crypto.Hash;
@ -120,8 +120,8 @@ public final class BondedReputation implements PersistablePayload, NetworkPayloa
return daoFacade.isUnlocking(this);
}
public boolean isUnlocking(BsqStateService bsqStateService) {
return bsqStateService.isUnlocking(this);
public boolean isUnlocking(DaoStateService daoStateService) {
return daoStateService.isUnlocking(this);
}
// We use only the immutable data

26
core/src/main/java/bisq/core/dao/bonding/bond/BondedReputationService.java
View File

@ -19,8 +19,8 @@ package bisq.core.dao.bonding.bond;
import bisq.core.app.BisqEnvironment;
import bisq.core.dao.bonding.BondingConsensus;
import bisq.core.dao.state.BsqStateListener;
import bisq.core.dao.state.BsqStateService;
import bisq.core.dao.state.DaoStateListener;
import bisq.core.dao.state.DaoStateService;
import bisq.core.dao.state.blockchain.Block;
import bisq.core.dao.state.blockchain.SpentInfo;
import bisq.core.dao.state.blockchain.TxType;
@ -39,13 +39,13 @@ import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class BondedReputationService implements PersistedDataHost, BsqStateListener {
public class BondedReputationService implements PersistedDataHost, DaoStateListener {
public interface BondedReputationListChangeListener {
void onListChanged(List<BondedReputation> list);
}
private final BsqStateService bsqStateService;
private final DaoStateService daoStateService;
private final Storage<BondedReputationList> storage;
private final BondedReputationList BondedReputationList = new BondedReputationList();
@ -58,11 +58,11 @@ public class BondedReputationService implements PersistedDataHost, BsqStateListe
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public BondedReputationService(Storage<BondedReputationList> storage, BsqStateService bsqStateService) {
public BondedReputationService(Storage<BondedReputationList> storage, DaoStateService daoStateService) {
this.storage = storage;
this.bsqStateService = bsqStateService;
this.daoStateService = daoStateService;
bsqStateService.addBsqStateListener(this);
daoStateService.addBsqStateListener(this);
}
@ -83,7 +83,7 @@ public class BondedReputationService implements PersistedDataHost, BsqStateListe
}
///////////////////////////////////////////////////////////////////////////////////////////
// BsqStateListener
// DaoStateListener
///////////////////////////////////////////////////////////////////////////////////////////
@Override
@ -94,11 +94,11 @@ public class BondedReputationService implements PersistedDataHost, BsqStateListe
public void onParseTxsComplete(Block block) {
BondedReputationList.getList().forEach(BondedReputation -> {
bsqStateService.getLockupTxOutputs().forEach(lockupTxOutput -> {
daoStateService.getLockupTxOutputs().forEach(lockupTxOutput -> {
String lockupTxId = lockupTxOutput.getTxId();
// log.error("lockupTxId " + lockupTxId);
bsqStateService.getTx(lockupTxId)
daoStateService.getTx(lockupTxId)
.ifPresent(lockupTx -> {
byte[] opReturnData = lockupTx.getLastTxOutput().getOpReturnData();
byte[] hash = BondingConsensus.getHashFromOpReturnData(opReturnData);
@ -109,10 +109,10 @@ public class BondedReputationService implements PersistedDataHost, BsqStateListe
persist();
}
if (!bsqStateService.isUnspent(lockupTxOutput.getKey())) {
bsqStateService.getSpentInfo(lockupTxOutput)
if (!daoStateService.isUnspent(lockupTxOutput.getKey())) {
daoStateService.getSpentInfo(lockupTxOutput)
.map(SpentInfo::getTxId)
.map(bsqStateService::getTx)
.map(daoStateService::getTx)
.map(Optional::get)
// TODO(sq): What if the tx is burnt and not unlocked, need to check on that
.filter(unlockTx -> unlockTx.getTxType() == TxType.UNLOCK)