mirror of
https://github.com/bisq-network/bisq.git
synced 2024-11-19 09:52:23 +01:00
Further refactorings: move classes to other packages
This commit is contained in:
Manfred Karrer
parent
16fac73b6d
commit
0d86176f4e
@ -17,9 +17,9 @@
|
||||
|
||||
package bisq.core.app;
|
||||
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.BtcOptionKeys;
|
||||
import bisq.core.btc.UserAgent;
|
||||
import bisq.core.btc.network.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.network.UserAgent;
|
||||
import bisq.core.dao.DaoOptionKeys;
|
||||
import bisq.core.exceptions.BisqException;
|
||||
import bisq.core.filter.FilterManager;
|
||||
|
||||
@ -19,7 +19,7 @@ package bisq.core.app;
|
||||
|
||||
import bisq.core.arbitration.ArbitratorManager;
|
||||
import bisq.core.btc.BtcOptionKeys;
|
||||
import bisq.core.btc.setup.RegTestHost;
|
||||
import bisq.core.btc.network.RegTestHost;
|
||||
import bisq.core.btc.setup.WalletsSetup;
|
||||
import bisq.core.btc.wallet.BsqWalletService;
|
||||
import bisq.core.btc.wallet.BtcWalletService;
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
package bisq.core.app;
|
||||
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.network.BaseCurrencyNetwork;
|
||||
|
||||
import bisq.network.crypto.DecryptedDataTuple;
|
||||
import bisq.network.crypto.EncryptionService;
|
||||
|
||||
@ -18,8 +18,9 @@
|
||||
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.network.BitcoinNodes;
|
||||
import bisq.core.btc.network.RegTestHost;
|
||||
import bisq.core.btc.network.UserAgent;
|
||||
import bisq.core.btc.setup.WalletsSetup;
|
||||
import bisq.core.btc.wallet.AddressEntryList;
|
||||
import bisq.core.btc.wallet.BalanceModel;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc;
|
||||
package bisq.core.btc.network;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.provider.fee.FeeService;
|
||||
@ -15,7 +15,7 @@
|
||||
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.setup;
|
||||
package bisq.core.btc.network;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
|
||||
@ -15,9 +15,9 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.setup;
|
||||
package bisq.core.btc.network;
|
||||
|
||||
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
|
||||
import bisq.core.btc.network.BitcoinNodes.BtcNode;
|
||||
|
||||
import bisq.network.DnsLookupException;
|
||||
import bisq.network.DnsLookupTor;
|
||||
@ -15,9 +15,9 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.setup;
|
||||
package bisq.core.btc.network;
|
||||
|
||||
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
|
||||
import bisq.core.btc.network.BitcoinNodes.BtcNode;
|
||||
|
||||
import org.bitcoinj.core.PeerAddress;
|
||||
|
||||
@ -31,20 +31,20 @@ import java.util.stream.Stream;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
class PeerAddressesRepository {
|
||||
public class PeerAddressesRepository {
|
||||
private final BtcNodeConverter converter;
|
||||
private final List<BtcNode> nodes;
|
||||
|
||||
PeerAddressesRepository(BtcNodeConverter converter, List<BtcNode> nodes) {
|
||||
public PeerAddressesRepository(BtcNodeConverter converter, List<BtcNode> nodes) {
|
||||
this.converter = converter;
|
||||
this.nodes = nodes;
|
||||
}
|
||||
|
||||
PeerAddressesRepository(List<BtcNode> nodes) {
|
||||
public PeerAddressesRepository(List<BtcNode> nodes) {
|
||||
this(new BtcNodeConverter(), nodes);
|
||||
}
|
||||
|
||||
List<PeerAddress> getPeerAddresses(@Nullable Socks5Proxy proxy, boolean isUseClearNodesWithProxies) {
|
||||
public List<PeerAddress> getPeerAddresses(@Nullable Socks5Proxy proxy, boolean isUseClearNodesWithProxies) {
|
||||
List<PeerAddress> result;
|
||||
// We connect to onion nodes only in case we use Tor for BitcoinJ (default) to avoid privacy leaks at
|
||||
// exit nodes with bloom filters.
|
||||
@ -33,7 +33,7 @@
|
||||
* PircBotX. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.setup;
|
||||
package bisq.core.btc.network;
|
||||
|
||||
import javax.net.SocketFactory;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.setup;
|
||||
package bisq.core.btc.network;
|
||||
|
||||
public enum RegTestHost {
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.setup;
|
||||
package bisq.core.btc.network;
|
||||
|
||||
import org.bitcoinj.core.NetworkParameters;
|
||||
import org.bitcoinj.net.discovery.PeerDiscovery;
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc;
|
||||
package bisq.core.btc.network;
|
||||
|
||||
import javax.inject.Inject;
|
||||
import javax.inject.Named;
|
||||
@ -15,7 +15,9 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.setup;
|
||||
package bisq.core.btc.network;
|
||||
|
||||
import bisq.core.btc.setup.WalletConfig;
|
||||
|
||||
import bisq.network.Socks5MultiDiscovery;
|
||||
|
||||
@ -32,7 +34,7 @@ import org.slf4j.LoggerFactory;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
class WalletNetworkConfig {
|
||||
public class WalletNetworkConfig {
|
||||
private static final Logger log = LoggerFactory.getLogger(WalletNetworkConfig.class);
|
||||
|
||||
@Nullable
|
||||
@ -41,15 +43,15 @@ class WalletNetworkConfig {
|
||||
private final NetworkParameters parameters;
|
||||
private final int socks5DiscoverMode;
|
||||
|
||||
WalletNetworkConfig(WalletConfig delegate, NetworkParameters parameters, int socks5DiscoverMode,
|
||||
@Nullable Socks5Proxy proxy) {
|
||||
public WalletNetworkConfig(WalletConfig delegate, NetworkParameters parameters, int socks5DiscoverMode,
|
||||
@Nullable Socks5Proxy proxy) {
|
||||
this.delegate = delegate;
|
||||
this.parameters = parameters;
|
||||
this.socks5DiscoverMode = socks5DiscoverMode;
|
||||
this.proxy = proxy;
|
||||
}
|
||||
|
||||
void proposePeers(List<PeerAddress> peers) {
|
||||
public void proposePeers(List<PeerAddress> peers) {
|
||||
if (!peers.isEmpty()) {
|
||||
log.info("You connect with peerAddresses: {}", peers);
|
||||
PeerAddress[] peerAddresses = peers.toArray(new PeerAddress[peers.size()]);
|
||||
@ -15,10 +15,11 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.setup;
|
||||
package bisq.core.btc.network;
|
||||
|
||||
import bisq.core.btc.setup.BitcoinNodes.BitcoinNodesOption;
|
||||
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
|
||||
import bisq.core.btc.network.BitcoinNodes.BitcoinNodesOption;
|
||||
import bisq.core.btc.network.BitcoinNodes.BtcNode;
|
||||
import bisq.core.btc.setup.WalletsSetup;
|
||||
import bisq.core.user.Preferences;
|
||||
|
||||
import bisq.common.util.Utilities;
|
||||
@ -30,20 +31,19 @@ import java.util.Set;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import static bisq.core.btc.setup.BitcoinNodes.BitcoinNodesOption.CUSTOM;
|
||||
import static bisq.core.btc.setup.WalletsSetup.DEFAULT_CONNECTIONS;
|
||||
import static bisq.core.btc.network.BitcoinNodes.BitcoinNodesOption.CUSTOM;
|
||||
|
||||
|
||||
class WalletSetupPreferences {
|
||||
public class WalletSetupPreferences {
|
||||
private static final Logger log = LoggerFactory.getLogger(WalletSetupPreferences.class);
|
||||
|
||||
private final Preferences preferences;
|
||||
|
||||
WalletSetupPreferences(Preferences preferences) {
|
||||
public WalletSetupPreferences(Preferences preferences) {
|
||||
this.preferences = preferences;
|
||||
}
|
||||
|
||||
List<BtcNode> selectPreferredNodes(BitcoinNodes nodes) {
|
||||
public List<BtcNode> selectPreferredNodes(BitcoinNodes nodes) {
|
||||
List<BtcNode> result;
|
||||
|
||||
BitcoinNodesOption nodesOption = BitcoinNodesOption.values()[preferences.getBitcoinNodesOptionOrdinal()];
|
||||
@ -71,11 +71,11 @@ class WalletSetupPreferences {
|
||||
return result;
|
||||
}
|
||||
|
||||
boolean isUseCustomNodes() {
|
||||
public boolean isUseCustomNodes() {
|
||||
return CUSTOM.ordinal() == preferences.getBitcoinNodesOptionOrdinal();
|
||||
}
|
||||
|
||||
int calculateMinBroadcastConnections(List<BtcNode> nodes) {
|
||||
public int calculateMinBroadcastConnections(List<BtcNode> nodes) {
|
||||
BitcoinNodesOption nodesOption = BitcoinNodesOption.values()[preferences.getBitcoinNodesOptionOrdinal()];
|
||||
int result;
|
||||
switch (nodesOption) {
|
||||
@ -87,7 +87,7 @@ class WalletSetupPreferences {
|
||||
break;
|
||||
case PUBLIC:
|
||||
// We keep the empty nodes
|
||||
result = (int) Math.floor(DEFAULT_CONNECTIONS * 0.8);
|
||||
result = (int) Math.floor(WalletsSetup.DEFAULT_CONNECTIONS * 0.8);
|
||||
break;
|
||||
case PROVIDED:
|
||||
default:
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.wallet;
|
||||
package bisq.core.btc.setup;
|
||||
|
||||
import org.bitcoinj.core.NetworkParameters;
|
||||
import org.bitcoinj.wallet.KeyChainGroup;
|
||||
@ -18,8 +18,8 @@
|
||||
package bisq.core.btc.setup;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.network.ProxySocketFactory;
|
||||
import bisq.core.btc.wallet.BisqRiskAnalysis;
|
||||
import bisq.core.btc.wallet.BsqWallet;
|
||||
|
||||
import bisq.common.app.Version;
|
||||
|
||||
|
||||
@ -19,7 +19,12 @@ package bisq.core.btc.setup;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.BtcOptionKeys;
|
||||
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
|
||||
import bisq.core.btc.network.BitcoinNodes;
|
||||
import bisq.core.btc.network.BitcoinNodes.BtcNode;
|
||||
import bisq.core.btc.network.PeerAddressesRepository;
|
||||
import bisq.core.btc.network.RegTestHost;
|
||||
import bisq.core.btc.network.WalletNetworkConfig;
|
||||
import bisq.core.btc.network.WalletSetupPreferences;
|
||||
import bisq.core.btc.wallet.AddressEntry;
|
||||
import bisq.core.btc.wallet.AddressEntryList;
|
||||
import bisq.core.user.Preferences;
|
||||
@ -100,7 +105,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
|
||||
@Slf4j
|
||||
public class WalletsSetup {
|
||||
// We reduce defaultConnections from 12 (PeerGroup.DEFAULT_CONNECTIONS) to 9 nodes
|
||||
static final int DEFAULT_CONNECTIONS = 9;
|
||||
public static final int DEFAULT_CONNECTIONS = 9;
|
||||
|
||||
private static final long STARTUP_TIMEOUT = 180;
|
||||
private static final String BSQ_WALLET_FILE_NAME = "bisq_BSQ.wallet";
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
/*
|
||||
* This file is part of Bisq.
|
||||
*
|
||||
* Bisq is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or (at
|
||||
* your option) any later version.
|
||||
*
|
||||
* Bisq is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
|
||||
* License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.wallet;
|
||||
|
||||
import org.bitcoinj.core.NetworkParameters;
|
||||
import org.bitcoinj.core.Sha256Hash;
|
||||
import org.bitcoinj.core.TransactionOutput;
|
||||
import org.bitcoinj.core.UTXO;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class BsqUtxoTransactionOutput extends TransactionOutput {
|
||||
private static final Logger log = LoggerFactory.getLogger(BsqUtxoTransactionOutput.class);
|
||||
private final UTXO output;
|
||||
private final int chainHeight;
|
||||
|
||||
/**
|
||||
* Construct a free standing Transaction Output.
|
||||
*
|
||||
* @param params The network parameters.
|
||||
* @param output The stored output (free standing).
|
||||
*/
|
||||
public BsqUtxoTransactionOutput(NetworkParameters params, UTXO output, int chainHeight) {
|
||||
super(params, null, output.getValue(), output.getScript().getProgram());
|
||||
this.output = output;
|
||||
this.chainHeight = chainHeight;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the {@link UTXO}.
|
||||
*
|
||||
* @return The stored output.
|
||||
*/
|
||||
public UTXO getUTXO() {
|
||||
return output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the depth withing the chain of the parent tx, depth is 1 if it the output height is the height of
|
||||
* the latest block.
|
||||
*
|
||||
* @return The depth.
|
||||
*/
|
||||
@Override
|
||||
public int getParentTransactionDepthInBlocks() {
|
||||
return chainHeight - output.getHeight() + 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getIndex() {
|
||||
return (int) output.getIndex();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Sha256Hash getParentTransactionHash() {
|
||||
return output.getHash();
|
||||
}
|
||||
}
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.data;
|
||||
package bisq.core.btc.wallet;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.data;
|
||||
package bisq.core.btc.wallet;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.btc.data;
|
||||
package bisq.core.btc.wallet;
|
||||
|
||||
import bisq.common.proto.network.NetworkPayload;
|
||||
import bisq.common.proto.persistable.PersistablePayload;
|
||||
@ -18,9 +18,6 @@
|
||||
package bisq.core.btc.wallet;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.data.InputsAndChangeOutput;
|
||||
import bisq.core.btc.data.PreparedDepositTxAndMakerInputs;
|
||||
import bisq.core.btc.data.RawTransactionInput;
|
||||
import bisq.core.btc.exceptions.SigningException;
|
||||
import bisq.core.btc.exceptions.TransactionVerificationException;
|
||||
import bisq.core.btc.exceptions.WalletException;
|
||||
|
||||
@ -19,7 +19,7 @@ package bisq.core.filter;
|
||||
|
||||
import bisq.core.app.AppOptionKeys;
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.setup.BitcoinNodes;
|
||||
import bisq.core.btc.network.BitcoinNodes;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.payment.payload.PaymentMethod;
|
||||
import bisq.core.provider.ProvidersRepository;
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
package bisq.core.locale;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.network.BaseCurrencyNetwork;
|
||||
|
||||
import bisq.common.UserThread;
|
||||
import bisq.common.app.DevEnv;
|
||||
|
||||
@ -18,21 +18,23 @@
|
||||
package bisq.core.payment.validation;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.network.BaseCurrencyNetwork;
|
||||
import bisq.core.locale.Res;
|
||||
import bisq.core.util.validation.InputValidator;
|
||||
|
||||
import bisq.asset.AddressValidationResult;
|
||||
import bisq.asset.Asset;
|
||||
import bisq.asset.AssetRegistry;
|
||||
import bisq.asset.Coin;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import static java.lang.String.format;
|
||||
|
||||
|
||||
|
||||
import bisq.asset.AddressValidationResult;
|
||||
import bisq.asset.Asset;
|
||||
import bisq.asset.AssetRegistry;
|
||||
import bisq.asset.Coin;
|
||||
|
||||
@Slf4j
|
||||
public final class AltCoinAddressValidator extends InputValidator {
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
package bisq.core.trade.messages;
|
||||
|
||||
import bisq.core.btc.data.RawTransactionInput;
|
||||
import bisq.core.btc.wallet.RawTransactionInput;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.proto.CoreProtoResolver;
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
package bisq.core.trade.messages;
|
||||
|
||||
import bisq.core.btc.data.RawTransactionInput;
|
||||
import bisq.core.btc.wallet.RawTransactionInput;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.proto.CoreProtoResolver;
|
||||
|
||||
|
||||
@ -18,9 +18,9 @@
|
||||
package bisq.core.trade.protocol;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.data.RawTransactionInput;
|
||||
import bisq.core.btc.wallet.BsqWalletService;
|
||||
import bisq.core.btc.wallet.BtcWalletService;
|
||||
import bisq.core.btc.wallet.RawTransactionInput;
|
||||
import bisq.core.btc.wallet.TradeWalletService;
|
||||
import bisq.core.filter.FilterManager;
|
||||
import bisq.core.network.MessageState;
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
package bisq.core.trade.protocol;
|
||||
|
||||
import bisq.core.btc.data.RawTransactionInput;
|
||||
import bisq.core.btc.wallet.RawTransactionInput;
|
||||
import bisq.core.payment.payload.PaymentAccountPayload;
|
||||
import bisq.core.proto.CoreProtoResolver;
|
||||
|
||||
|
||||
@ -17,10 +17,10 @@
|
||||
|
||||
package bisq.core.trade.protocol.tasks.buyer_as_maker;
|
||||
|
||||
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.btc.wallet.PreparedDepositTxAndMakerInputs;
|
||||
import bisq.core.btc.wallet.RawTransactionInput;
|
||||
import bisq.core.offer.Offer;
|
||||
import bisq.core.trade.Trade;
|
||||
import bisq.core.trade.protocol.TradingPeer;
|
||||
|
||||
@ -17,9 +17,9 @@
|
||||
|
||||
package bisq.core.trade.protocol.tasks.buyer_as_taker;
|
||||
|
||||
import bisq.core.btc.data.InputsAndChangeOutput;
|
||||
import bisq.core.btc.wallet.AddressEntry;
|
||||
import bisq.core.btc.wallet.BtcWalletService;
|
||||
import bisq.core.btc.wallet.InputsAndChangeOutput;
|
||||
import bisq.core.trade.Trade;
|
||||
import bisq.core.trade.protocol.tasks.TradeTask;
|
||||
|
||||
|
||||
@ -17,10 +17,10 @@
|
||||
|
||||
package bisq.core.trade.protocol.tasks.buyer_as_taker;
|
||||
|
||||
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.RawTransactionInput;
|
||||
import bisq.core.btc.wallet.TxBroadcaster;
|
||||
import bisq.core.trade.Trade;
|
||||
import bisq.core.trade.protocol.TradingPeer;
|
||||
|
||||
@ -17,10 +17,10 @@
|
||||
|
||||
package bisq.core.trade.protocol.tasks.seller_as_maker;
|
||||
|
||||
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.btc.wallet.PreparedDepositTxAndMakerInputs;
|
||||
import bisq.core.btc.wallet.RawTransactionInput;
|
||||
import bisq.core.offer.Offer;
|
||||
import bisq.core.trade.Trade;
|
||||
import bisq.core.trade.protocol.TradingPeer;
|
||||
|
||||
@ -17,9 +17,9 @@
|
||||
|
||||
package bisq.core.trade.protocol.tasks.seller_as_taker;
|
||||
|
||||
import bisq.core.btc.data.InputsAndChangeOutput;
|
||||
import bisq.core.btc.wallet.AddressEntry;
|
||||
import bisq.core.btc.wallet.BtcWalletService;
|
||||
import bisq.core.btc.wallet.InputsAndChangeOutput;
|
||||
import bisq.core.trade.Trade;
|
||||
import bisq.core.trade.protocol.tasks.TradeTask;
|
||||
|
||||
|
||||
@ -17,10 +17,10 @@
|
||||
|
||||
package bisq.core.trade.protocol.tasks.seller_as_taker;
|
||||
|
||||
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.RawTransactionInput;
|
||||
import bisq.core.btc.wallet.TxBroadcaster;
|
||||
import bisq.core.trade.Contract;
|
||||
import bisq.core.trade.Trade;
|
||||
|
||||
@ -19,9 +19,9 @@ package bisq.core.user;
|
||||
|
||||
import bisq.core.app.AppOptionKeys;
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.BtcOptionKeys;
|
||||
import bisq.core.btc.setup.BitcoinNodes;
|
||||
import bisq.core.btc.network.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.network.BitcoinNodes;
|
||||
import bisq.core.btc.wallet.Restrictions;
|
||||
import bisq.core.locale.Country;
|
||||
import bisq.core.locale.CountryUtil;
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
package bisq.core.btc.wallet;
|
||||
|
||||
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
|
||||
import bisq.core.btc.network.BitcoinNodes.BtcNode;
|
||||
import bisq.core.btc.setup.BtcNodeConverter;
|
||||
import bisq.core.btc.setup.BtcNodeConverter.Facade;
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
package bisq.core.btc.wallet;
|
||||
|
||||
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
|
||||
import bisq.core.btc.network.BitcoinNodes.BtcNode;
|
||||
import bisq.core.btc.setup.BtcNodeConverter;
|
||||
import bisq.core.btc.setup.PeerAddressesRepository;
|
||||
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
|
||||
package bisq.core.btc.wallet;
|
||||
|
||||
import bisq.core.btc.setup.BitcoinNodes;
|
||||
import bisq.core.btc.setup.BitcoinNodes.BtcNode;
|
||||
import bisq.core.btc.network.BitcoinNodes;
|
||||
import bisq.core.btc.network.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.setup.BitcoinNodes.BitcoinNodesOption.CUSTOM;
|
||||
import static bisq.core.btc.setup.BitcoinNodes.BitcoinNodesOption.PUBLIC;
|
||||
import static bisq.core.btc.network.BitcoinNodes.BitcoinNodesOption.CUSTOM;
|
||||
import static bisq.core.btc.network.BitcoinNodes.BitcoinNodesOption.PUBLIC;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.mockito.Mockito.mock;
|
||||
|
||||
@ -18,12 +18,10 @@
|
||||
package bisq.core.payment.validation;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.network.BaseCurrencyNetwork;
|
||||
import bisq.core.locale.CurrencyUtil;
|
||||
import bisq.core.locale.Res;
|
||||
|
||||
import bisq.asset.AssetRegistry;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.hamcrest.CoreMatchers.containsString;
|
||||
@ -31,6 +29,10 @@ import static org.junit.Assert.assertThat;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
|
||||
|
||||
import bisq.asset.AssetRegistry;
|
||||
|
||||
public class AltCoinAddressValidatorTest {
|
||||
|
||||
@Test
|
||||
|
||||
@ -21,7 +21,7 @@ import bisq.desktop.main.overlays.Overlay;
|
||||
import bisq.desktop.util.FormBuilder;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.network.BaseCurrencyNetwork;
|
||||
import bisq.core.locale.Res;
|
||||
|
||||
import bisq.common.app.DevEnv;
|
||||
|
||||
@ -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.setup.BitcoinNodes;
|
||||
import bisq.core.btc.network.BitcoinNodes;
|
||||
import bisq.core.btc.setup.WalletsSetup;
|
||||
import bisq.core.filter.Filter;
|
||||
import bisq.core.filter.FilterManager;
|
||||
|
||||
@ -29,7 +29,7 @@ import bisq.desktop.util.ImageUtil;
|
||||
import bisq.desktop.util.Layout;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.network.BaseCurrencyNetwork;
|
||||
import bisq.core.locale.Country;
|
||||
import bisq.core.locale.CountryUtil;
|
||||
import bisq.core.locale.CryptoCurrency;
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
package bisq.desktop.util.validation;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.network.BaseCurrencyNetwork;
|
||||
import bisq.core.locale.CurrencyUtil;
|
||||
import bisq.core.locale.Res;
|
||||
import bisq.core.util.BSFormatter;
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
package bisq.desktop.util.validation;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.network.BaseCurrencyNetwork;
|
||||
import bisq.core.locale.CurrencyUtil;
|
||||
import bisq.core.locale.Res;
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
package bisq.desktop.util.validation;
|
||||
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.BaseCurrencyNetwork;
|
||||
import bisq.core.btc.network.BaseCurrencyNetwork;
|
||||
import bisq.core.locale.CurrencyUtil;
|
||||
import bisq.core.locale.Res;
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ package bisq.monitor;
|
||||
import bisq.core.app.AppOptionKeys;
|
||||
import bisq.core.app.BisqEnvironment;
|
||||
import bisq.core.btc.BtcOptionKeys;
|
||||
import bisq.core.btc.UserAgent;
|
||||
import bisq.core.btc.network.UserAgent;
|
||||
import bisq.core.dao.DaoOptionKeys;
|
||||
|
||||
import bisq.network.NetworkOptionKeys;
|
||||
|
||||
@ -19,7 +19,7 @@ package bisq.monitor.metrics;
|
||||
|
||||
import bisq.monitor.MonitorOptionKeys;
|
||||
|
||||
import bisq.core.btc.setup.BitcoinNodes;
|
||||
import bisq.core.btc.network.BitcoinNodes;
|
||||
import bisq.core.btc.setup.WalletsSetup;
|
||||
import bisq.core.locale.Res;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user