mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further refactorings move classes to other packages

Browse Source
This commit is contained in:
Manfred Karrer 2018-09-23 14:56:46 -05:00
parent 6c7bf96fee
commit 16fac73b6d
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
74 changed files with 87 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/bisq/core/app/BisqExecutable.java
View File

@ -19,7 +19,7 @@ package bisq.core.app;
import bisq.core.arbitration.ArbitratorManager;
import bisq.core.btc.BtcOptionKeys;
import bisq.core.btc.RegTestHost;
import bisq.core.btc.setup.RegTestHost;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;

2
core/src/main/java/bisq/core/app/BisqFacade.java
View File

@ -17,7 +17,7 @@
package bisq.core.app;
import bisq.core.btc.BalanceModel;
import bisq.core.btc.wallet.BalanceModel;
import bisq.core.presentation.BalancePresentation;
import bisq.common.app.Version;

4
core/src/main/java/bisq/core/app/BisqSetup.java
View File

@ -23,10 +23,10 @@ import bisq.core.alert.PrivateNotificationManager;
import bisq.core.alert.PrivateNotificationPayload;
import bisq.core.arbitration.ArbitratorManager;
import bisq.core.arbitration.DisputeManager;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.BalanceModel;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BalanceModel;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsManager;
import bisq.core.dao.DaoSetup;

4
core/src/main/java/bisq/core/btc/BitcoinModule.java
View File

@ -18,7 +18,11 @@
package bisq.core.btc;
import bisq.core.app.AppOptionKeys;
import bisq.core.btc.setup.BitcoinNodes;
import bisq.core.btc.setup.RegTestHost;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.AddressEntryList;
import bisq.core.btc.wallet.BalanceModel;
import bisq.core.btc.wallet.BsqCoinSelector;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;

2
core/src/main/java/bisq/core/btc/BitcoinNodes.java → core/src/main/java/bisq/core/btc/setup/BitcoinNodes.java
View File

@ -15,7 +15,7 @@
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc;
package bisq.core.btc.setup;
import bisq.core.app.BisqEnvironment;

2
core/src/main/java/bisq/core/btc/setup/BtcNodeConverter.java
View File

@ -17,7 +17,7 @@
package bisq.core.btc.setup;
import bisq.core.btc.BitcoinNodes.BtcNode;
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
import bisq.network.DnsLookupException;
import bisq.network.DnsLookupTor;

2
core/src/main/java/bisq/core/btc/setup/PeerAddressesRepository.java
View File

@ -17,7 +17,7 @@
package bisq.core.btc.setup;
import bisq.core.btc.BitcoinNodes.BtcNode;
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
import org.bitcoinj.core.PeerAddress;

2
core/src/main/java/bisq/core/btc/RegTestHost.java → core/src/main/java/bisq/core/btc/setup/RegTestHost.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc;
package bisq.core.btc.setup;
public enum RegTestHost {

7
core/src/main/java/bisq/core/btc/setup/WalletSetupPreferences.java
View File

@ -17,9 +17,8 @@
package bisq.core.btc.setup;
import bisq.core.btc.BitcoinNodes;
import bisq.core.btc.BitcoinNodes.BitcoinNodesOption;
import bisq.core.btc.BitcoinNodes.BtcNode;
import bisq.core.btc.setup.BitcoinNodes.BitcoinNodesOption;
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
import bisq.core.user.Preferences;
import bisq.common.util.Utilities;
@ -31,7 +30,7 @@ import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static bisq.core.btc.BitcoinNodes.BitcoinNodesOption.CUSTOM;
import static bisq.core.btc.setup.BitcoinNodes.BitcoinNodesOption.CUSTOM;
import static bisq.core.btc.setup.WalletsSetup.DEFAULT_CONNECTIONS;

8
core/src/main/java/bisq/core/btc/setup/WalletsSetup.java
View File

@ -18,12 +18,10 @@
package bisq.core.btc.setup;
import bisq.core.app.BisqEnvironment;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.AddressEntryList;
import bisq.core.btc.BitcoinNodes;
import bisq.core.btc.BitcoinNodes.BtcNode;
import bisq.core.btc.BtcOptionKeys;
import bisq.core.btc.RegTestHost;
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.AddressEntryList;
import bisq.core.user.Preferences;
import bisq.network.Socks5MultiDiscovery;

2
core/src/main/java/bisq/core/btc/AddressEntry.java → core/src/main/java/bisq/core/btc/wallet/AddressEntry.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc;
package bisq.core.btc.wallet;
import bisq.core.app.BisqEnvironment;

2
core/src/main/java/bisq/core/btc/AddressEntryList.java → core/src/main/java/bisq/core/btc/wallet/AddressEntryList.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc;
package bisq.core.btc.wallet;
import bisq.common.proto.persistable.PersistableEnvelope;
import bisq.common.proto.persistable.PersistedDataHost;

3
core/src/main/java/bisq/core/btc/BalanceModel.java → core/src/main/java/bisq/core/btc/wallet/BalanceModel.java
View File

@ -15,9 +15,8 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc;
package bisq.core.btc.wallet;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.OpenOfferManager;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;

2
core/src/main/java/bisq/core/btc/wallet/BisqDefaultCoinSelector.java
View File

@ -17,8 +17,6 @@
package bisq.core.btc.wallet;
import bisq.core.btc.Restrictions;
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.InsufficientMoneyException;
import org.bitcoinj.core.NetworkParameters;

1
core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java
View File

@ -18,7 +18,6 @@
package bisq.core.btc.wallet;
import bisq.core.app.BisqEnvironment;
import bisq.core.btc.Restrictions;
import bisq.core.btc.exceptions.InsufficientBsqException;
import bisq.core.btc.exceptions.TransactionVerificationException;
import bisq.core.btc.exceptions.WalletException;

3
core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java
View File

@ -17,9 +17,6 @@
package bisq.core.btc.wallet;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.AddressEntryList;
import bisq.core.btc.Restrictions;
import bisq.core.btc.exceptions.AddressEntryException;
import bisq.core.btc.exceptions.InsufficientFundsException;
import bisq.core.btc.exceptions.TransactionVerificationException;

2
core/src/main/java/bisq/core/btc/Restrictions.java → core/src/main/java/bisq/core/btc/wallet/Restrictions.java
View File

@ -15,7 +15,7 @@
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.btc;
package bisq.core.btc.wallet;
import bisq.core.app.BisqEnvironment;

1
core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java
View File

@ -18,7 +18,6 @@
package bisq.core.btc.wallet;
import bisq.core.app.BisqEnvironment;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.data.InputsAndChangeOutput;
import bisq.core.btc.data.PreparedDepositTxAndMakerInputs;
import bisq.core.btc.data.RawTransactionInput;

2
core/src/main/java/bisq/core/filter/FilterManager.java
View File

@ -19,7 +19,7 @@ package bisq.core.filter;
import bisq.core.app.AppOptionKeys;
import bisq.core.app.BisqEnvironment;
import bisq.core.btc.BitcoinNodes;
import bisq.core.btc.setup.BitcoinNodes;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.provider.ProvidersRepository;

2
core/src/main/java/bisq/core/offer/OfferUtil.java
View File

@ -18,8 +18,8 @@
package bisq.core.offer;
import bisq.core.app.BisqEnvironment;
import bisq.core.btc.Restrictions;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.monetary.Price;
import bisq.core.monetary.Volume;
import bisq.core.provider.fee.FeeService;

2
core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java
View File

@ -18,8 +18,8 @@
package bisq.core.offer.placeoffer.tasks;
import bisq.core.arbitration.Arbitrator;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.exceptions.TxBroadcastException;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.TradeWalletService;

2
core/src/main/java/bisq/core/presentation/BalancePresentation.java
View File

@ -17,7 +17,7 @@
package bisq.core.presentation;
import bisq.core.btc.BalanceModel;
import bisq.core.btc.wallet.BalanceModel;
import bisq.core.util.BSFormatter;
import javax.inject.Inject;

2
core/src/main/java/bisq/core/proto/ProtoDevUtil.java
View File

@ -18,7 +18,7 @@
package bisq.core.proto;
import bisq.core.arbitration.DisputeResult;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.offer.AvailabilityResult;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferPayload;

2
core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java
View File

@ -18,7 +18,7 @@
package bisq.core.proto.persistable;
import bisq.core.arbitration.DisputeList;
import bisq.core.btc.AddressEntryList;
import bisq.core.btc.wallet.AddressEntryList;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.dao.governance.ballot.BallotList;
import bisq.core.dao.governance.blindvote.MyBlindVoteList;

2
core/src/main/java/bisq/core/setup/CorePersistedDataHost.java
View File

@ -18,7 +18,7 @@
package bisq.core.setup;
import bisq.core.arbitration.DisputeManager;
import bisq.core.btc.AddressEntryList;
import bisq.core.btc.wallet.AddressEntryList;
import bisq.core.dao.DaoOptionKeys;
import bisq.core.dao.governance.ballot.BallotListService;
import bisq.core.dao.governance.blindvote.MyBlindVoteListService;

2
core/src/main/java/bisq/core/trade/TradeManager.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.exceptions.AddressEntryException;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.TradeWalletService;

2
core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerProcessPayoutTxPublishedMessage.java
View File

@ -17,7 +17,7 @@
package bisq.core.trade.protocol.tasks.buyer;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.PayoutTxPublishedMessage;

2
core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSendCounterCurrencyTransferStartedMessage.java
View File

@ -17,7 +17,7 @@
package bisq.core.trade.protocol.tasks.buyer;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.CounterCurrencyTransferStartedMessage;

2
core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSetupPayoutTxListener.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade.protocol.tasks.buyer;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.AddressConfidenceListener;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_maker/BuyerAsMakerCreatesAndSignsDepositTx.java
View File

@ -17,9 +17,9 @@
package bisq.core.trade.protocol.tasks.buyer_as_maker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.data.PreparedDepositTxAndMakerInputs;
import bisq.core.btc.data.RawTransactionInput;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.trade.Trade;

2
core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_maker/BuyerAsMakerSignPayoutTx.java
View File

@ -17,7 +17,7 @@
package bisq.core.trade.protocol.tasks.buyer_as_maker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerCreatesDepositTxInputs.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade.protocol.tasks.buyer_as_taker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.data.InputsAndChangeOutput;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignAndPublishDepositTx.java
View File

@ -17,9 +17,9 @@
package bisq.core.trade.protocol.tasks.buyer_as_taker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.data.RawTransactionInput;
import bisq.core.btc.exceptions.TxBroadcastException;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.TxBroadcaster;
import bisq.core.trade.Trade;

2
core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerCreateAndSignContract.java
View File

@ -17,7 +17,7 @@
package bisq.core.trade.protocol.tasks.maker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.BuyerAsMakerTrade;

2
core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerProcessDepositTxPublishedMessage.java
View File

@ -17,7 +17,7 @@
package bisq.core.trade.protocol.tasks.maker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.trade.Trade;
import bisq.core.trade.messages.DepositTxPublishedMessage;

2
core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerSendPublishDepositTxRequest.java
View File

@ -17,7 +17,7 @@
package bisq.core.trade.protocol.tasks.maker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.Trade;

2
core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerSetupDepositTxListener.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade.protocol.tasks.maker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.AddressConfidenceListener;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerSignAndFinalizePayoutTx.java
View File

@ -17,7 +17,7 @@
package bisq.core.trade.protocol.tasks.seller;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.trade.Trade;

2
core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerCreatesAndSignsDepositTx.java
View File

@ -17,9 +17,9 @@
package bisq.core.trade.protocol.tasks.seller_as_maker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.data.PreparedDepositTxAndMakerInputs;
import bisq.core.btc.data.RawTransactionInput;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.Offer;
import bisq.core.trade.Trade;

2
core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerCreatesDepositTxInputs.java
View File

@ -17,8 +17,8 @@
package bisq.core.trade.protocol.tasks.seller_as_taker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.data.InputsAndChangeOutput;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.tasks.TradeTask;

2
core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java
View File

@ -17,9 +17,9 @@
package bisq.core.trade.protocol.tasks.seller_as_taker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.data.RawTransactionInput;
import bisq.core.btc.exceptions.TxBroadcastException;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.TxBroadcaster;
import bisq.core.trade.Contract;

2
core/src/main/java/bisq/core/trade/protocol/tasks/taker/CreateTakerFeeTx.java
View File

@ -18,8 +18,8 @@
package bisq.core.trade.protocol.tasks.taker;
import bisq.core.arbitration.Arbitrator;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.exceptions.TxBroadcastException;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.TradeWalletService;

2
core/src/main/java/bisq/core/trade/protocol/tasks/taker/TakerSendPayDepositRequest.java
View File

@ -17,7 +17,7 @@
package bisq.core.trade.protocol.tasks.taker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.Trade;

2
core/src/main/java/bisq/core/trade/protocol/tasks/taker/TakerVerifyAndSignContract.java
View File

@ -17,7 +17,7 @@
package bisq.core.trade.protocol.tasks.taker;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.Contract;

4
core/src/main/java/bisq/core/user/Preferences.java
View File

@ -20,9 +20,9 @@ package bisq.core.user;
import bisq.core.app.AppOptionKeys;
import bisq.core.app.BisqEnvironment;
import bisq.core.btc.BaseCurrencyNetwork;
import bisq.core.btc.BitcoinNodes;
import bisq.core.btc.BtcOptionKeys;
import bisq.core.btc.Restrictions;
import bisq.core.btc.setup.BitcoinNodes;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.locale.Country;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.CryptoCurrency;

2
core/src/main/java/bisq/core/user/PreferencesPayload.java
View File

@ -17,7 +17,7 @@
package bisq.core.user;
import bisq.core.btc.Restrictions;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.locale.Country;
import bisq.core.locale.CryptoCurrency;
import bisq.core.locale.FiatCurrency;

2
core/src/test/java/bisq/core/btc/RestrictionsTest.java
View File

@ -17,6 +17,8 @@
package bisq.core.btc;
import bisq.core.btc.wallet.Restrictions;
import org.bitcoinj.core.Coin;
import org.junit.Test;

2
core/src/test/java/bisq/core/btc/wallet/BtcNodeConverterTest.java
View File

@ -17,7 +17,7 @@
package bisq.core.btc.wallet;
import bisq.core.btc.BitcoinNodes.BtcNode;
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
import bisq.core.btc.setup.BtcNodeConverter;
import bisq.core.btc.setup.BtcNodeConverter.Facade;

2
core/src/test/java/bisq/core/btc/wallet/PeerAddressesRepositoryTest.java
View File

@ -17,7 +17,7 @@
package bisq.core.btc.wallet;
import bisq.core.btc.BitcoinNodes.BtcNode;
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
import bisq.core.btc.setup.BtcNodeConverter;
import bisq.core.btc.setup.PeerAddressesRepository;

8
core/src/test/java/bisq/core/btc/wallet/WalletSetupPreferencesTest.java
View File

@ -17,8 +17,8 @@
package bisq.core.btc.wallet;
import bisq.core.btc.BitcoinNodes;
import bisq.core.btc.BitcoinNodes.BtcNode;
import bisq.core.btc.setup.BitcoinNodes;
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
import bisq.core.btc.setup.WalletSetupPreferences;
import bisq.core.user.Preferences;
@ -31,8 +31,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
import static bisq.core.btc.BitcoinNodes.BitcoinNodesOption.CUSTOM;
import static bisq.core.btc.BitcoinNodes.BitcoinNodesOption.PUBLIC;
import static bisq.core.btc.setup.BitcoinNodes.BitcoinNodesOption.CUSTOM;
import static bisq.core.btc.setup.BitcoinNodes.BitcoinNodesOption.PUBLIC;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;

2
desktop/src/main/java/bisq/desktop/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java
View File

@ -21,7 +21,7 @@ import bisq.desktop.common.model.ActivatableViewModel;
import bisq.core.arbitration.Arbitrator;
import bisq.core.arbitration.ArbitratorManager;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.locale.LanguageUtil;
import bisq.core.user.User;

2
desktop/src/main/java/bisq/desktop/main/dao/bonding/lockup/LockupView.java
View File

@ -26,9 +26,9 @@ import bisq.desktop.util.FormBuilder;
import bisq.desktop.util.Layout;
import bisq.desktop.util.validation.BsqValidator;
import bisq.core.btc.Restrictions;
import bisq.core.btc.listeners.BsqBalanceListener;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.dao.DaoFacade;
import bisq.core.dao.bonding.BondingConsensus;
import bisq.core.dao.bonding.lockup.LockupType;

2
desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
View File

@ -33,13 +33,13 @@ import bisq.desktop.util.validation.BsqAddressValidator;
import bisq.desktop.util.validation.BsqValidator;
import bisq.desktop.util.validation.BtcValidator;
import bisq.core.btc.Restrictions;
import bisq.core.btc.exceptions.TxBroadcastException;
import bisq.core.btc.exceptions.TxMalleabilityException;
import bisq.core.btc.listeners.BsqBalanceListener;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.btc.wallet.TxBroadcaster;
import bisq.core.btc.wallet.WalletsManager;
import bisq.core.locale.Res;

2
desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositListItem.java
View File

@ -20,9 +20,9 @@ package bisq.desktop.main.funds.deposit;
import bisq.desktop.components.indicator.TxConfidenceIndicator;
import bisq.desktop.util.GUIUtil;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.listeners.TxConfidenceListener;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.locale.Res;
import bisq.core.util.BSFormatter;

2
desktop/src/main/java/bisq/desktop/main/funds/deposit/DepositView.java
View File

@ -30,8 +30,8 @@ import bisq.desktop.main.overlays.windows.QRCodeWindow;
import bisq.desktop.util.GUIUtil;
import bisq.desktop.util.Layout;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.locale.Res;
import bisq.core.provider.fee.FeeService;

2
desktop/src/main/java/bisq/desktop/main/funds/locked/LockedListItem.java
View File

@ -19,8 +19,8 @@ package bisq.desktop.main.funds.locked;
import bisq.desktop.components.AutoTooltipLabel;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletService;
import bisq.core.trade.Tradable;

2
desktop/src/main/java/bisq/desktop/main/funds/locked/LockedView.java
View File

@ -25,8 +25,8 @@ import bisq.desktop.main.overlays.windows.OfferDetailsWindow;
import bisq.desktop.main.overlays.windows.TradeDetailsWindow;
import bisq.desktop.util.GUIUtil;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.locale.Res;
import bisq.core.offer.OpenOffer;

2
desktop/src/main/java/bisq/desktop/main/funds/reserved/ReservedListItem.java
View File

@ -19,8 +19,8 @@ package bisq.desktop.main.funds.reserved;
import bisq.desktop.components.AutoTooltipLabel;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.offer.OpenOffer;
import bisq.core.trade.Tradable;

2
desktop/src/main/java/bisq/desktop/main/funds/reserved/ReservedView.java
View File

@ -25,8 +25,8 @@ import bisq.desktop.main.overlays.windows.OfferDetailsWindow;
import bisq.desktop.main.overlays.windows.TradeDetailsWindow;
import bisq.desktop.util.GUIUtil;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.locale.Res;
import bisq.core.offer.OpenOffer;

2
desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalListItem.java
View File

@ -19,8 +19,8 @@ package bisq.desktop.main.funds.withdrawal;
import bisq.desktop.components.AutoTooltipLabel;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.locale.Res;
import bisq.core.util.BSFormatter;

4
desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java
View File

@ -26,13 +26,13 @@ import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.main.overlays.windows.WalletPasswordWindow;
import bisq.desktop.util.GUIUtil;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.Restrictions;
import bisq.core.btc.exceptions.AddressEntryException;
import bisq.core.btc.exceptions.InsufficientFundsException;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.locale.Res;
import bisq.core.trade.Tradable;
import bisq.core.trade.Trade;

4
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java
View File

@ -19,12 +19,12 @@ package bisq.desktop.main.offer;
import bisq.core.app.BisqEnvironment;
import bisq.core.arbitration.Arbitrator;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.Restrictions;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.listeners.BsqBalanceListener;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.btc.wallet.TradeWalletService;
import bisq.core.filter.FilterManager;
import bisq.core.locale.CurrencyUtil;

2
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java
View File

@ -35,8 +35,8 @@ import bisq.desktop.util.validation.MonetaryValidator;
import bisq.desktop.util.validation.SecurityDepositValidator;
import bisq.core.app.BisqEnvironment;
import bisq.core.btc.Restrictions;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;

2
desktop/src/main/java/bisq/desktop/main/offer/OfferDataModel.java
View File

@ -19,7 +19,7 @@ package bisq.desktop.main.offer;
import bisq.desktop.common.model.ActivatableDataModel;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import org.bitcoinj.core.Coin;

4
desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferDataModel.java
View File

@ -22,11 +22,11 @@ import bisq.desktop.main.overlays.popups.Popup;
import bisq.core.app.BisqEnvironment;
import bisq.core.arbitration.Arbitrator;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.Restrictions;
import bisq.core.btc.listeners.BalanceListener;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.btc.wallet.TradeWalletService;
import bisq.core.filter.FilterManager;
import bisq.core.locale.CurrencyUtil;

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
View File

@ -27,8 +27,8 @@ import bisq.desktop.util.Layout;
import bisq.core.arbitration.Dispute;
import bisq.core.arbitration.DisputeManager;
import bisq.core.arbitration.DisputeResult;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.exceptions.TransactionVerificationException;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.TradeWalletService;
import bisq.core.locale.Res;

2
desktop/src/main/java/bisq/desktop/main/overlays/windows/EmptyWalletWindow.java
View File

@ -24,10 +24,10 @@ import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.util.GUIUtil;
import bisq.desktop.util.Transitions;
import bisq.core.btc.Restrictions;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.btc.wallet.WalletService;
import bisq.core.locale.Res;
import bisq.core.offer.OpenOfferManager;

4
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java
View File

@ -32,11 +32,11 @@ import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView;
import bisq.desktop.util.FormBuilder;
import bisq.desktop.util.Layout;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.Restrictions;
import bisq.core.btc.exceptions.AddressEntryException;
import bisq.core.btc.exceptions.InsufficientFundsException;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.locale.Res;
import bisq.core.user.DontShowAgainLookup;
import bisq.core.util.BSFormatter;

2
desktop/src/main/java/bisq/desktop/main/settings/network/NetworkSettingsView.java
View File

@ -29,7 +29,7 @@ import bisq.desktop.main.overlays.windows.TorNetworkSettingsWindow;
import bisq.desktop.util.GUIUtil;
import bisq.core.app.BisqEnvironment;
import bisq.core.btc.BitcoinNodes;
import bisq.core.btc.setup.BitcoinNodes;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.filter.Filter;
import bisq.core.filter.FilterManager;

2
desktop/src/main/java/bisq/desktop/util/validation/BsqValidator.java
View File

@ -17,7 +17,7 @@
package bisq.desktop.util.validation;
import bisq.core.btc.Restrictions;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.locale.Res;
import bisq.core.util.BsqFormatter;
import bisq.core.util.CoinUtil;

2
desktop/src/main/java/bisq/desktop/util/validation/BtcValidator.java
View File

@ -17,7 +17,7 @@
package bisq.desktop.util.validation;
import bisq.core.btc.Restrictions;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.locale.Res;
import bisq.core.util.BSFormatter;

2
desktop/src/main/java/bisq/desktop/util/validation/SecurityDepositValidator.java
View File

@ -17,7 +17,7 @@
package bisq.desktop.util.validation;
import bisq.core.btc.Restrictions;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.locale.Res;
import bisq.core.util.BSFormatter;

2
desktop/src/test/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModelTest.java
View File

@ -22,7 +22,7 @@ import bisq.desktop.util.validation.BtcValidator;
import bisq.desktop.util.validation.FiatPriceValidator;
import bisq.desktop.util.validation.SecurityDepositValidator;
import bisq.core.btc.AddressEntry;
import bisq.core.btc.wallet.AddressEntry;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.locale.CryptoCurrency;

2
monitor/src/main/java/bisq/monitor/metrics/MetricsModel.java
View File

@ -19,7 +19,7 @@ package bisq.monitor.metrics;
import bisq.monitor.MonitorOptionKeys;
import bisq.core.btc.BitcoinNodes;
import bisq.core.btc.setup.BitcoinNodes;
import bisq.core.btc.setup.WalletsSetup;
import bisq.core.locale.Res;