BSQ swaps: Refactorings (non funtional changes) [1]

apitest/scripts/trade-simulation-utils.sh

@@ -458,7 +458,7 @@ delayconfirmpaymentreceived() {
 }
 
 # This is a large function that should be broken up if it ever makes sense to not treat a trade
-# execution simulation as an atomic operation.  But we are not testing api methods here, just
+# execution simulation as an bsq swap operation.  But we are not testing api methods here, just
 # demonstrating how to use them to get through the trade protocol.  It should work for any trade
 # between Bob & Alice, as long as Alice is maker, Bob is taker, and the offer to be taken is the
 # first displayed in Bob's getoffers command output.

apitest/src/test/java/bisq/apitest/method/trade/ExpectedProtocolStatus.java

@@ -1,6 +1,6 @@
 package bisq.apitest.method.trade;
 
-import bisq.core.trade.Trade;
+import bisq.core.trade.model.bisq_v1.Trade;
 
 /**
  * A test fixture encapsulating expected trade protocol status.

apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBSQOfferTest.java

@@ -37,13 +37,13 @@
 import static bisq.cli.TableFormat.formatBalancesTbls;
 import static bisq.cli.TableFormat.formatOfferTable;
 import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
-import static bisq.core.trade.Trade.Phase.DEPOSIT_CONFIRMED;
-import static bisq.core.trade.Trade.Phase.FIAT_SENT;
-import static bisq.core.trade.Trade.Phase.PAYOUT_PUBLISHED;
-import static bisq.core.trade.Trade.State.BUYER_RECEIVED_PAYOUT_TX_PUBLISHED_MSG;
-import static bisq.core.trade.Trade.State.DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN;
-import static bisq.core.trade.Trade.State.SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG;
-import static bisq.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.DEPOSIT_CONFIRMED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.FIAT_SENT;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.PAYOUT_PUBLISHED;
+import static bisq.core.trade.model.bisq_v1.Trade.State.BUYER_RECEIVED_PAYOUT_TX_PUBLISHED_MSG;
+import static bisq.core.trade.model.bisq_v1.Trade.State.DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN;
+import static bisq.core.trade.model.bisq_v1.Trade.State.SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG;
+import static bisq.core.trade.model.bisq_v1.Trade.State.SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG;
 import static java.lang.String.format;
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.assertEquals;

apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferTest.java

@@ -37,10 +37,10 @@
 import static bisq.apitest.config.ApiTestConfig.BSQ;
 import static bisq.cli.TableFormat.formatBalancesTbls;
 import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
-import static bisq.core.trade.Trade.Phase.DEPOSIT_CONFIRMED;
-import static bisq.core.trade.Trade.Phase.FIAT_SENT;
-import static bisq.core.trade.Trade.Phase.PAYOUT_PUBLISHED;
-import static bisq.core.trade.Trade.State.*;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.DEPOSIT_CONFIRMED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.FIAT_SENT;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.PAYOUT_PUBLISHED;
+import static bisq.core.trade.model.bisq_v1.Trade.State.*;
 import static java.lang.String.format;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

apitest/src/test/java/bisq/apitest/method/trade/TakeBuyBTCOfferWithNationalBankAcctTest.java

@@ -55,10 +55,10 @@
 import static bisq.apitest.config.ApiTestConfig.BSQ;
 import static bisq.cli.TableFormat.formatBalancesTbls;
 import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
-import static bisq.core.trade.Trade.Phase.DEPOSIT_CONFIRMED;
-import static bisq.core.trade.Trade.Phase.FIAT_SENT;
-import static bisq.core.trade.Trade.Phase.PAYOUT_PUBLISHED;
-import static bisq.core.trade.Trade.State.*;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.DEPOSIT_CONFIRMED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.FIAT_SENT;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.PAYOUT_PUBLISHED;
+import static bisq.core.trade.model.bisq_v1.Trade.State.*;
 import static java.lang.String.format;
 import static org.junit.jupiter.api.Assertions.*;
 import static protobuf.Offer.State.OFFER_FEE_PAID;

apitest/src/test/java/bisq/apitest/method/trade/TakeSellBSQOfferTest.java

@@ -38,14 +38,14 @@
 import static bisq.cli.TableFormat.formatBalancesTbls;
 import static bisq.cli.TableFormat.formatOfferTable;
 import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
-import static bisq.core.trade.Trade.Phase.DEPOSIT_CONFIRMED;
-import static bisq.core.trade.Trade.Phase.FIAT_SENT;
-import static bisq.core.trade.Trade.Phase.PAYOUT_PUBLISHED;
-import static bisq.core.trade.Trade.Phase.WITHDRAWN;
-import static bisq.core.trade.Trade.State.DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN;
-import static bisq.core.trade.Trade.State.SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG;
-import static bisq.core.trade.Trade.State.SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG;
-import static bisq.core.trade.Trade.State.WITHDRAW_COMPLETED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.DEPOSIT_CONFIRMED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.FIAT_SENT;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.PAYOUT_PUBLISHED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.WITHDRAWN;
+import static bisq.core.trade.model.bisq_v1.Trade.State.DEPOSIT_CONFIRMED_IN_BLOCK_CHAIN;
+import static bisq.core.trade.model.bisq_v1.Trade.State.SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG;
+import static bisq.core.trade.model.bisq_v1.Trade.State.SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG;
+import static bisq.core.trade.model.bisq_v1.Trade.State.WITHDRAW_COMPLETED;
 import static java.lang.String.format;
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.assertEquals;

apitest/src/test/java/bisq/apitest/method/trade/TakeSellBTCOfferTest.java

@@ -37,11 +37,11 @@
 import static bisq.apitest.config.ApiTestConfig.BTC;
 import static bisq.cli.TableFormat.formatBalancesTbls;
 import static bisq.core.btc.wallet.Restrictions.getDefaultBuyerSecurityDepositAsPercent;
-import static bisq.core.trade.Trade.Phase.DEPOSIT_CONFIRMED;
-import static bisq.core.trade.Trade.Phase.FIAT_SENT;
-import static bisq.core.trade.Trade.Phase.PAYOUT_PUBLISHED;
-import static bisq.core.trade.Trade.Phase.WITHDRAWN;
-import static bisq.core.trade.Trade.State.*;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.DEPOSIT_CONFIRMED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.FIAT_SENT;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.PAYOUT_PUBLISHED;
+import static bisq.core.trade.model.bisq_v1.Trade.Phase.WITHDRAWN;
+import static bisq.core.trade.model.bisq_v1.Trade.State.*;
 import static java.lang.String.format;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java

@@ -23,8 +23,8 @@
 import bisq.core.locale.CurrencyUtil;
 import bisq.core.locale.Res;
 import bisq.core.offer.Offer;
-import bisq.core.offer.OfferPayload;
 import bisq.core.offer.OfferRestrictions;
+import bisq.core.offer.bisq_v1.OfferPayload;
 import bisq.core.payment.AssetAccount;
 import bisq.core.payment.ChargeBackRisk;
 import bisq.core.payment.PaymentAccount;
@@ -33,9 +33,9 @@
 import bisq.core.support.dispute.Dispute;
 import bisq.core.support.dispute.DisputeResult;
 import bisq.core.support.dispute.arbitration.TraderDataItem;
-import bisq.core.trade.Contract;
-import bisq.core.trade.Trade;
-import bisq.core.trade.protocol.TradingPeer;
+import bisq.core.trade.model.bisq_v1.Contract;
+import bisq.core.trade.model.bisq_v1.Trade;
+import bisq.core.trade.protocol.bisq_v1.model.TradingPeer;
 import bisq.core.user.User;
 
 import bisq.network.p2p.BootstrapListener;

core/src/main/java/bisq/core/account/witness/AccountAgeWitnessUtils.java

@@ -20,7 +20,7 @@
 import bisq.core.account.sign.SignedWitness;
 import bisq.core.account.sign.SignedWitnessService;
 import bisq.core.payment.payload.PaymentAccountPayload;
-import bisq.core.trade.Trade;
+import bisq.core.trade.model.bisq_v1.Trade;
 
 import bisq.network.p2p.storage.P2PDataStorage;
 

core/src/main/java/bisq/core/api/CoreApi.java

@@ -25,7 +25,7 @@
 import bisq.core.offer.OpenOffer;
 import bisq.core.payment.PaymentAccount;
 import bisq.core.payment.payload.PaymentMethod;
-import bisq.core.trade.Trade;
+import bisq.core.trade.model.bisq_v1.Trade;
 import bisq.core.trade.statistics.TradeStatistics3;
 import bisq.core.trade.statistics.TradeStatisticsManager;
 

core/src/main/java/bisq/core/api/CoreOffersService.java

@@ -19,15 +19,15 @@
 
 import bisq.core.monetary.Altcoin;
 import bisq.core.monetary.Price;
-import bisq.core.offer.CreateOfferService;
-import bisq.core.offer.MutableOfferPayloadFields;
 import bisq.core.offer.Offer;
 import bisq.core.offer.OfferBookService;
-import bisq.core.offer.OfferFilter;
-import bisq.core.offer.OfferPayload;
+import bisq.core.offer.OfferFilterService;
 import bisq.core.offer.OfferUtil;
 import bisq.core.offer.OpenOffer;
 import bisq.core.offer.OpenOfferManager;
+import bisq.core.offer.bisq_v1.CreateOfferService;
+import bisq.core.offer.bisq_v1.MutableOfferPayloadFields;
+import bisq.core.offer.bisq_v1.OfferPayload;
 import bisq.core.payment.PaymentAccount;
 import bisq.core.provider.price.PriceFeedService;
 import bisq.core.user.User;
@@ -57,10 +57,10 @@
 import static bisq.common.util.MathUtils.scaleUpByPowerOf10;
 import static bisq.core.locale.CurrencyUtil.isCryptoCurrency;
 import static bisq.core.offer.Offer.State;
-import static bisq.core.offer.OfferPayload.Direction;
-import static bisq.core.offer.OfferPayload.Direction.BUY;
 import static bisq.core.offer.OpenOffer.State.AVAILABLE;
 import static bisq.core.offer.OpenOffer.State.DEACTIVATED;
+import static bisq.core.offer.bisq_v1.OfferPayload.Direction;
+import static bisq.core.offer.bisq_v1.OfferPayload.Direction.BUY;
 import static bisq.core.payment.PaymentAccountUtil.isPaymentAccountValidForOffer;
 import static bisq.proto.grpc.EditOfferRequest.EditType;
 import static bisq.proto.grpc.EditOfferRequest.EditType.*;
@@ -85,7 +85,7 @@ class CoreOffersService {
     private final CoreWalletsService coreWalletsService;
     private final CreateOfferService createOfferService;
     private final OfferBookService offerBookService;
-    private final OfferFilter offerFilter;
+    private final OfferFilterService offerFilterService;
     private final OpenOfferManager openOfferManager;
     private final OfferUtil offerUtil;
     private final PriceFeedService priceFeedService;
@@ -97,7 +97,7 @@ public CoreOffersService(CoreContext coreContext,
                              CoreWalletsService coreWalletsService,
                              CreateOfferService createOfferService,
                              OfferBookService offerBookService,
-                             OfferFilter offerFilter,
+                             OfferFilterService offerFilterService,
                              OpenOfferManager openOfferManager,
                              OfferUtil offerUtil,
                              PriceFeedService priceFeedService,
@@ -107,7 +107,7 @@ public CoreOffersService(CoreContext coreContext,
         this.coreWalletsService = coreWalletsService;
         this.createOfferService = createOfferService;
         this.offerBookService = offerBookService;
-        this.offerFilter = offerFilter;
+        this.offerFilterService = offerFilterService;
         this.openOfferManager = openOfferManager;
         this.offerUtil = offerUtil;
         this.priceFeedService = priceFeedService;
@@ -118,7 +118,7 @@ Offer getOffer(String id) {
         return offerBookService.getOffers().stream()
                 .filter(o -> o.getId().equals(id))
                 .filter(o -> !o.isMyOffer(keyRing))
-                .filter(o -> offerFilter.canTakeOffer(o, coreContext.isApiUser()).isValid())
+                .filter(o -> offerFilterService.canTakeOffer(o, coreContext.isApiUser()).isValid())
                 .findAny().orElseThrow(() ->
                         new IllegalStateException(format("offer with id '%s' not found", id)));
     }
@@ -135,7 +135,7 @@ List<Offer> getOffers(String direction, String currencyCode) {
         return offerBookService.getOffers().stream()
                 .filter(o -> !o.isMyOffer(keyRing))
                 .filter(o -> offerMatchesDirectionAndCurrency(o, direction, currencyCode))
-                .filter(o -> offerFilter.canTakeOffer(o, coreContext.isApiUser()).isValid())
+                .filter(o -> offerFilterService.canTakeOffer(o, coreContext.isApiUser()).isValid())
                 .sorted(priceComparator(direction))
                 .collect(Collectors.toList());
     }

core/src/main/java/bisq/core/api/CoreTradesService.java

@@ -21,14 +21,14 @@
 import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.offer.Offer;
 import bisq.core.offer.OfferUtil;
-import bisq.core.offer.takeoffer.TakeOfferModel;
-import bisq.core.trade.Tradable;
-import bisq.core.trade.Trade;
+import bisq.core.offer.bisq_v1.TakeOfferModel;
 import bisq.core.trade.TradeManager;
-import bisq.core.trade.TradeUtil;
-import bisq.core.trade.closed.ClosedTradableManager;
-import bisq.core.trade.protocol.BuyerProtocol;
-import bisq.core.trade.protocol.SellerProtocol;
+import bisq.core.trade.bisq_v1.ClosedTradableManager;
+import bisq.core.trade.bisq_v1.TradeUtil;
+import bisq.core.trade.model.Tradable;
+import bisq.core.trade.model.bisq_v1.Trade;
+import bisq.core.trade.protocol.bisq_v1.BuyerProtocol;
+import bisq.core.trade.protocol.bisq_v1.SellerProtocol;
 import bisq.core.user.User;
 import bisq.core.util.validation.BtcAddressValidator;
 
@@ -100,7 +100,7 @@ void takeOffer(Offer offer,
             throw new IllegalArgumentException(format("payment account with id '%s' not found", paymentAccountId));
 
         var useSavingsWallet = true;
-        //noinspection ConstantConditions
+
         takeOfferModel.initModel(offer, paymentAccount, useSavingsWallet);
         log.info("Initiating take {} offer, {}",
                 offer.isBuyOffer() ? "buy" : "sell",

core/src/main/java/bisq/core/api/CoreWalletsService.java

@@ -82,7 +82,6 @@
 
 import javax.annotation.Nullable;
 
-import static bisq.common.config.BaseCurrencyNetwork.BTC_DAO_REGTEST;
 import static bisq.core.btc.wallet.Restrictions.getMinNonDustOutput;
 import static bisq.core.util.ParsingUtils.parseToCoin;
 import static java.lang.String.format;

core/src/main/java/bisq/core/api/model/TradeInfo.java

@@ -17,8 +17,8 @@
 
 package bisq.core.api.model;
 
-import bisq.core.trade.Contract;
-import bisq.core.trade.Trade;
+import bisq.core.trade.model.bisq_v1.Contract;
+import bisq.core.trade.model.bisq_v1.Trade;
 
 import bisq.common.Payload;
 

core/src/main/java/bisq/core/app/BisqSetup.java

@@ -42,7 +42,7 @@
 import bisq.core.support.dispute.mediation.MediationManager;
 import bisq.core.support.dispute.refund.RefundManager;
 import bisq.core.trade.TradeManager;
-import bisq.core.trade.TradeTxException;
+import bisq.core.trade.bisq_v1.TradeTxException;
 import bisq.core.user.Preferences;
 import bisq.core.user.User;
 import bisq.core.util.FormattingUtils;

core/src/main/java/bisq/core/app/DomainInitialisation.java

@@ -34,7 +34,7 @@
 import bisq.core.notifications.alerts.market.MarketAlerts;
 import bisq.core.notifications.alerts.price.PriceAlert;
 import bisq.core.offer.OpenOfferManager;
-import bisq.core.offer.TriggerPriceService;
+import bisq.core.offer.bisq_v1.TriggerPriceService;
 import bisq.core.payment.AmazonGiftCardAccount;
 import bisq.core.payment.RevolutAccount;
 import bisq.core.payment.TradeLimits;
@@ -49,8 +49,8 @@
 import bisq.core.support.dispute.refund.refundagent.RefundAgentManager;
 import bisq.core.support.traderchat.TraderChatManager;
 import bisq.core.trade.TradeManager;
-import bisq.core.trade.closed.ClosedTradableManager;
-import bisq.core.trade.failed.FailedTradesManager;
+import bisq.core.trade.bisq_v1.ClosedTradableManager;
+import bisq.core.trade.bisq_v1.FailedTradesManager;
 import bisq.core.trade.statistics.TradeStatisticsManager;
 import bisq.core.trade.txproof.xmr.XmrTxProofService;
 import bisq.core.user.User;

core/src/main/java/bisq/core/btc/Balances.java

@@ -24,10 +24,10 @@
 import bisq.core.offer.OpenOfferManager;
 import bisq.core.support.dispute.Dispute;
 import bisq.core.support.dispute.refund.RefundManager;
-import bisq.core.trade.Trade;
 import bisq.core.trade.TradeManager;
-import bisq.core.trade.closed.ClosedTradableManager;
-import bisq.core.trade.failed.FailedTradesManager;
+import bisq.core.trade.bisq_v1.ClosedTradableManager;
+import bisq.core.trade.bisq_v1.FailedTradesManager;
+import bisq.core.trade.model.bisq_v1.Trade;
 
 import bisq.common.UserThread;
 

core/src/main/java/bisq/core/btc/TxFeeEstimationService.java

@@ -55,11 +55,11 @@ public class TxFeeEstimationService {
 //  segwit deposit tx with change vsize = 263
 //  segwit payout tx vsize = 169
 //  segwit delayed payout tx vsize = 139
-    public static int TYPICAL_TX_WITH_1_INPUT_VSIZE = 175;
-    private static int DEPOSIT_TX_VSIZE = 233;
+public static final int TYPICAL_TX_WITH_1_INPUT_VSIZE = 175;
+    private static final int DEPOSIT_TX_VSIZE = 233;
 
-    private static int BSQ_INPUT_INCREASE = 70;
-    private static int MAX_ITERATIONS = 10;
+    private static final int BSQ_INPUT_INCREASE = 70;
+    private static final int MAX_ITERATIONS = 10;
 
     private final FeeService feeService;
     private final BtcWalletService btcWalletService;

core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java

@@ -20,14 +20,14 @@
 import org.bitcoinj.core.TransactionConfidence;
 
 public class TxConfidenceListener {
-    private final String txID;
+    private final String txId;
 
-    public TxConfidenceListener(String txID) {
-        this.txID = txID;
+    public TxConfidenceListener(String txId) {
+        this.txId = txId;
     }
 
-    public String getTxID() {
-        return txID;
+    public String getTxId() {
+        return txId;
     }
 
     @SuppressWarnings("UnusedParameters")