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

Remove storage and persist calls. Remove unused methods

Browse source
This commit is contained in:
chimp1984 2020-10-01 18:52:01 -05:00
parent 8a6b2a77d6
commit 2d91c268d0
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
1 changed files with 2 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
core/src/main/java/bisq/core/trade/Trade.java
View file

@ -37,7 +37,6 @@ import bisq.network.p2p.NodeAddress;
import bisq.common.crypto.PubKeyRing;
import bisq.common.proto.ProtoUtil;
import bisq.common.storage.Storage;
import bisq.common.taskrunner.Model;
import bisq.common.util.Utilities;
@ -368,10 +367,8 @@ public abstract class Trade implements Tradable, Model {
transient final private Coin txFee;
@Getter
transient final private Coin takerFee;
@Getter // to set in constructor so not final but set at init
transient private Storage<? extends TradableList> storage;
@Getter // to set in constructor so not final but set at init
transient private BtcWalletService btcWalletService;
@Getter
final transient private BtcWalletService btcWalletService;
transient final private ObjectProperty<State> stateProperty = new SimpleObjectProperty<>(state);
transient final private ObjectProperty<Phase> statePhaseProperty = new SimpleObjectProperty<>(state.phase);
@ -463,7 +460,6 @@ public abstract class Trade implements Tradable, Model {
@Nullable NodeAddress arbitratorNodeAddress,
@Nullable NodeAddress mediatorNodeAddress,
@Nullable NodeAddress refundAgentNodeAddress,
Storage<? extends TradableList> storage,
BtcWalletService btcWalletService,
ProcessModel processModel) {
this.offer = offer;
@ -473,7 +469,6 @@ public abstract class Trade implements Tradable, Model {
this.arbitratorNodeAddress = arbitratorNodeAddress;
this.mediatorNodeAddress = mediatorNodeAddress;
this.refundAgentNodeAddress = refundAgentNodeAddress;
this.storage = storage;
this.btcWalletService = btcWalletService;
this.processModel = processModel;
@ -497,7 +492,6 @@ public abstract class Trade implements Tradable, Model {
@Nullable NodeAddress arbitratorNodeAddress,
@Nullable NodeAddress mediatorNodeAddress,
@Nullable NodeAddress refundAgentNodeAddress,
Storage<? extends TradableList> storage,
BtcWalletService btcWalletService,
ProcessModel processModel) {
@ -508,7 +502,6 @@ public abstract class Trade implements Tradable, Model {
arbitratorNodeAddress,
mediatorNodeAddress,
refundAgentNodeAddress,
storage,
btcWalletService,
processModel);
this.tradePrice = tradePrice;
@ -619,26 +612,18 @@ public abstract class Trade implements Tradable, Model {
// API
///////////////////////////////////////////////////////////////////////////////////////////
public void setTransientFields(Storage<? extends TradableList> storage, BtcWalletService btcWalletService) {
this.storage = storage;
this.btcWalletService = btcWalletService;
}
public void initialize(ProcessModelServiceProvider serviceProvider) {
serviceProvider.getArbitratorManager().getDisputeAgentByNodeAddress(arbitratorNodeAddress).ifPresent(arbitrator -> {
arbitratorBtcPubKey = arbitrator.getBtcPubKey();
arbitratorPubKeyRing = arbitrator.getPubKeyRing();
persist();
});
serviceProvider.getMediatorManager().getDisputeAgentByNodeAddress(mediatorNodeAddress).ifPresent(mediator -> {
mediatorPubKeyRing = mediator.getPubKeyRing();
persist();
});
serviceProvider.getRefundAgentManager().getDisputeAgentByNodeAddress(refundAgentNodeAddress).ifPresent(refundAgent -> {
refundAgentPubKeyRing = refundAgent.getPubKeyRing();
persist();
});
isInitialized = true;
@ -659,7 +644,6 @@ public abstract class Trade implements Tradable, Model {
this.depositTx = tx;
depositTxId = depositTx.getTxId().toString();
setupConfidenceListener();
persist();
}
@Nullable
@ -673,12 +657,10 @@ public abstract class Trade implements Tradable, Model {
public void applyDelayedPayoutTx(Transaction delayedPayoutTx) {
this.delayedPayoutTx = delayedPayoutTx;
this.delayedPayoutTxBytes = delayedPayoutTx.bitcoinSerialize();
persist();
}
public void applyDelayedPayoutTxBytes(byte[] delayedPayoutTxBytes) {
this.delayedPayoutTxBytes = delayedPayoutTxBytes;
persist();
}
@Nullable
@ -710,7 +692,6 @@ public abstract class Trade implements Tradable, Model {
public void addAndPersistChatMessage(ChatMessage chatMessage) {
if (!chatMessages.contains(chatMessage)) {
chatMessages.add(chatMessage);
storage.queueUpForSave();
} else {
log.error("Trade ChatMessage already exists");
}
@ -720,35 +701,13 @@ public abstract class Trade implements Tradable, Model {
errorMessage = errorMessage == null ? msg : errorMessage + "\n" + msg;
}
public boolean allowedRefresh() {
var allowRefresh = new Date().getTime() > lastRefreshRequestDate + getRefreshInterval();
if (!allowRefresh) {
log.info("Refresh not allowed, last refresh at {}", lastRefreshRequestDate);
}
return allowRefresh;
}
public void logRefresh() {
var time = new Date().getTime();
log.debug("Log refresh at {}", time);
lastRefreshRequestDate = time;
}
///////////////////////////////////////////////////////////////////////////////////////////
// Model implementation
///////////////////////////////////////////////////////////////////////////////////////////
// Get called from taskRunner after each completed task
@Override
public void persist() {
if (storage != null)
storage.queueUpForSave();
}
@Override
public void onComplete() {
persist();
}
@ -782,46 +741,29 @@ public abstract class Trade implements Tradable, Model {
log.warn(message);
}
boolean changed = this.state != state;
this.state = state;
stateProperty.set(state);
statePhaseProperty.set(state.getPhase());
if (changed)
persist();
}
public void setDisputeState(DisputeState disputeState) {
boolean changed = this.disputeState != disputeState;
this.disputeState = disputeState;
disputeStateProperty.set(disputeState);
if (changed)
persist();
}
public void setMediationResultState(MediationResultState mediationResultState) {
boolean changed = this.mediationResultState != mediationResultState;
this.mediationResultState = mediationResultState;
mediationResultStateProperty.set(mediationResultState);
if (changed)
persist();
}
public void setRefundResultState(RefundResultState refundResultState) {
boolean changed = this.refundResultState != refundResultState;
this.refundResultState = refundResultState;
refundResultStateProperty.set(refundResultState);
if (changed)
persist();
}
public void setTradePeriodState(TradePeriodState tradePeriodState) {
boolean changed = this.tradePeriodState != tradePeriodState;
this.tradePeriodState = tradePeriodState;
tradePeriodStateProperty.set(tradePeriodState);
if (changed)
persist();
}
public void setTradingPeerNodeAddress(NodeAddress tradingPeerNodeAddress) {
@ -851,7 +793,6 @@ public abstract class Trade implements Tradable, Model {
public void setAssetTxProofResult(@Nullable AssetTxProofResult assetTxProofResult) {
this.assetTxProofResult = assetTxProofResult;
assetTxProofResultUpdateProperty.set(assetTxProofResultUpdateProperty.get() + 1);
persist();
}
@ -1188,7 +1129,6 @@ public abstract class Trade implements Tradable, Model {
",\n chatMessages=" + chatMessages +
",\n txFee=" + txFee +
",\n takerFee=" + takerFee +
",\n storage=" + storage +
",\n btcWalletService=" + btcWalletService +
",\n stateProperty=" + stateProperty +
",\n statePhaseProperty=" + statePhaseProperty +