mirror of
https://github.com/haveno-dex/haveno.git
synced 2025-03-29 18:48:57 +00:00
remove outdated code for v1.0.7 update
This commit is contained in:
parent
d7be2885bd
commit
5711aabad8
3 changed files with 0 additions and 24 deletions
core/src/main/java/haveno/core
support/dispute/arbitration
trade/protocol/tasks
|
@ -62,7 +62,6 @@ import haveno.core.support.dispute.messages.DisputeClosedMessage;
|
|||
import haveno.core.support.dispute.messages.DisputeOpenedMessage;
|
||||
import haveno.core.support.messages.ChatMessage;
|
||||
import haveno.core.support.messages.SupportMessage;
|
||||
import haveno.core.trade.BuyerTrade;
|
||||
import haveno.core.trade.ClosedTradableManager;
|
||||
import haveno.core.trade.Contract;
|
||||
import haveno.core.trade.HavenoUtils;
|
||||
|
@ -464,14 +463,6 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
|
|||
// check daemon connection
|
||||
trade.verifyDaemonConnection();
|
||||
|
||||
// adapt from 1.0.6 to 1.0.7 which changes field usage
|
||||
// TODO: remove after future updates to allow old trades to clear
|
||||
if (trade.getPayoutTxHex() != null && trade.getBuyer().getPaymentSentMessage() != null && trade.getPayoutTxHex().equals(trade.getBuyer().getPaymentSentMessage().getPayoutTxHex())) {
|
||||
log.warn("Nullifying payout tx hex after 1.0.7 update {} {}", trade.getClass().getSimpleName(), trade.getShortId());
|
||||
if (trade instanceof BuyerTrade) trade.getSelf().setUnsignedPayoutTxHex(trade.getPayoutTxHex());
|
||||
trade.setPayoutTxHex(null);
|
||||
}
|
||||
|
||||
// sign arbitrator-signed payout tx
|
||||
if (trade.getPayoutTxHex() == null) {
|
||||
try {
|
||||
|
|
|
@ -125,14 +125,6 @@ public class ProcessPaymentReceivedMessage extends TradeTask {
|
|||
|
||||
private void processPayoutTx(PaymentReceivedMessage message) {
|
||||
|
||||
// adapt from 1.0.6 to 1.0.7 which changes field usage
|
||||
// TODO: remove after future updates to allow old trades to clear
|
||||
if (trade.getPayoutTxHex() != null && trade.getBuyer().getPaymentSentMessage() != null && trade.getPayoutTxHex().equals(trade.getBuyer().getPaymentSentMessage().getPayoutTxHex())) {
|
||||
log.warn("Nullifying payout tx hex after 1.0.7 update {} {}", trade.getClass().getSimpleName(), trade.getShortId());
|
||||
if (trade instanceof BuyerTrade) trade.getSelf().setUnsignedPayoutTxHex(trade.getPayoutTxHex());
|
||||
trade.setPayoutTxHex(null);
|
||||
}
|
||||
|
||||
// update wallet
|
||||
trade.importMultisigHex();
|
||||
trade.syncAndPollWallet();
|
||||
|
|
|
@ -43,13 +43,6 @@ public class SellerPreparePaymentReceivedMessage extends TradeTask {
|
|||
// handle first time preparation
|
||||
if (trade.getArbitrator().getPaymentReceivedMessage() == null) {
|
||||
|
||||
// adapt from 1.0.6 to 1.0.7 which changes field usage
|
||||
// TODO: remove after future updates to allow old trades to clear
|
||||
if (trade.getPayoutTxHex() != null && trade.getPayoutTxHex().equals(trade.getBuyer().getPaymentSentMessage().getPayoutTxHex())) {
|
||||
log.warn("Nullifying payout tx hex after 1.0.7 update {} {}", trade.getClass().getSimpleName(), trade.getShortId());
|
||||
trade.setPayoutTxHex(null);
|
||||
}
|
||||
|
||||
// synchronize on lock for wallet operations
|
||||
synchronized (trade.getWalletLock()) {
|
||||
synchronized (HavenoUtils.getWalletFunctionLock()) {
|
||||
|
|
Loading…
Reference in a new issue