From 276bbb22192a52c109b54bac339247eb1947c2e7 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 17 Mar 2015 22:58:23 +0100 Subject: [PATCH] Refactor models for taker --- .../protocol/availability/CheckOfferAvailabilityProtocol.java | 2 +- .../io/bitsquare/trade/protocol/trade/OfferSharedModel.java | 2 +- .../trade/protocol/trade/taker/SellerAsTakerProtocol.java | 2 +- .../trade/protocol/trade/taker/models/OffererModel.java | 2 +- .../trade/protocol/trade/taker/models/SellerAsTakerModel.java | 4 ---- .../trade/protocol/trade/taker/models/TakerModel.java | 2 +- .../trade/taker/tasks/ProcessBankTransferStartedMessage.java | 2 +- 7 files changed, 6 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java index 00720b4572..ada39fd19c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/availability/CheckOfferAvailabilityProtocol.java @@ -36,7 +36,7 @@ public class CheckOfferAvailabilityProtocol { private final CheckOfferAvailabilityModel model; private final ResultHandler resultHandler; - private ErrorMessageHandler errorMessageHandler; + private final ErrorMessageHandler errorMessageHandler; private final MessageHandler messageHandler; private boolean isCanceled; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/OfferSharedModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/OfferSharedModel.java index 5b212632bc..bb435b0d10 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/OfferSharedModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/OfferSharedModel.java @@ -45,7 +45,7 @@ public class OfferSharedModel extends SharedModel { private final WalletService walletService; private final BlockChainService blockChainService; private final SignatureService signatureService; - private Persistence persistence; + private final Persistence persistence; // derived diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java index fec7391e71..e81a8fd8ce 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java @@ -53,7 +53,7 @@ import static io.bitsquare.util.Validator.nonEmptyStringOf; public class SellerAsTakerProtocol { private static final Logger log = LoggerFactory.getLogger(SellerAsTakerProtocol.class); - public static final int TIMEOUT_DELAY = 10000; + private static final int TIMEOUT_DELAY = 10000; private final SellerAsTakerModel model; private final MessageHandler messageHandler; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java index f5827894a6..f034f1deb4 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/OffererModel.java @@ -30,7 +30,7 @@ public class OffererModel { this.peer = peer; } - public Peer peer; + public final Peer peer; public byte[] pubKey; public Coin payoutAmount; public String payoutAddress; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java index 3b78a20340..26e8dd690c 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/SellerAsTakerModel.java @@ -89,10 +89,6 @@ public class SellerAsTakerModel extends OfferSharedModel { this.takeOfferFeeTx = takeOfferFeeTx; } - public void setDepositTx(Transaction transaction) { - - } - public Transaction getPayoutTx() { return payoutTx; } diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/TakerModel.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/TakerModel.java index e779036045..e622d01d23 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/TakerModel.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/models/TakerModel.java @@ -25,7 +25,7 @@ import org.bitcoinj.core.TransactionOutput; import java.util.List; -public class TakerModel { +class TakerModel { public List connectedOutputsForAllInputs; public List outputs; diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java index 794dc24803..fb7ee9cde2 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferStartedMessage.java @@ -43,7 +43,7 @@ public class ProcessBankTransferStartedMessage extends Task checkTradeId(model.getId(), model.getTradeMessage()); BankTransferStartedMessage message = (BankTransferStartedMessage) model.getTradeMessage(); - model.setDepositTx(checkNotNull(message.getDepositTx())); + model.setPublishedDepositTx(checkNotNull(message.getDepositTx())); model.offerer.signature = checkNotNull(ECKey.ECDSASignature.decodeFromDER(message.getOffererSignature())); model.offerer.payoutAmount = positiveCoinOf(nonZeroCoinOf(message.getOffererPayoutAmount())); model.taker.payoutAmount = positiveCoinOf(nonZeroCoinOf(message.getTakerPayoutAmount()));