mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename SeedNodesRepository => SeedNodeRepository

Browse source 
The idiomatic approach to naming domain-driven design (DDD)-style
repositories is to use the singular form of the object being
encapsulated by the repository, e.g. BookRepository vs. BooksRepository.

Thus far, the repository interfaces and implementations created here in
Bisq have used the latter, plural form, but going forward we should
revert to the norm. To this end, this commit renames SeedNodesRepository
and its single implementation to SeedNodeRepository and
CoreSeedNodeRepository respectively.
This commit is contained in:
Chris Beams 2018-02-20 11:01:21 +01:00
parent a737194d39
commit 4ac45d7fe8
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
17 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/main/java/io/bisq/core/dao/blockchain/BsqFullNode.java
View file

@ -32,7 +32,7 @@ import io.bisq.core.dao.blockchain.vo.BsqBlock;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.network.p2p.P2PService;
import io.bisq.network.p2p.network.Connection;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.Nullable;
@ -56,12 +56,12 @@ public class BsqFullNode extends BsqNode {
BsqBlockChain bsqBlockChain,
JsonBlockChainExporter jsonBlockChainExporter,
FeeService feeService,
SeedNodesRepository seedNodesRepository) {
SeedNodeRepository seedNodeRepository) {
super(p2PService,
bsqParser,
bsqBlockChain,
feeService,
seedNodesRepository);
seedNodeRepository);
this.bsqFullNodeExecutor = bsqFullNodeExecutor;
this.jsonBlockChainExporter = jsonBlockChainExporter;
}
@ -158,7 +158,7 @@ public class BsqFullNode extends BsqNode {
requestManager = new RequestManager(p2PService.getNetworkNode(),
p2PService.getPeerManager(),
p2PService.getBroadcaster(),
seedNodesRepository.getSeedNodeAddresses(),
seedNodeRepository.getSeedNodeAddresses(),
bsqBlockChain,
new RequestManager.Listener() {
@Override

8
core/src/main/java/io/bisq/core/dao/blockchain/BsqLiteNode.java
View file

@ -31,7 +31,7 @@ import io.bisq.core.dao.blockchain.vo.BsqBlock;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.network.p2p.P2PService;
import io.bisq.network.p2p.network.Connection;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.Nullable;
@ -55,12 +55,12 @@ public class BsqLiteNode extends BsqNode {
BsqLiteNodeExecutor bsqLiteNodeExecutor,
BsqBlockChain bsqBlockChain,
FeeService feeService,
SeedNodesRepository seedNodesRepository) {
SeedNodeRepository seedNodeRepository) {
super(p2PService,
bsqParser,
bsqBlockChain,
feeService,
seedNodesRepository);
seedNodeRepository);
this.bsqLiteNodeExecutor = bsqLiteNodeExecutor;
}
@ -81,7 +81,7 @@ public class BsqLiteNode extends BsqNode {
requestManager = new RequestManager(p2PService.getNetworkNode(),
p2PService.getPeerManager(),
p2PService.getBroadcaster(),
seedNodesRepository.getSeedNodeAddresses(),
seedNodeRepository.getSeedNodeAddresses(),
bsqBlockChain,
new RequestManager.Listener() {
@Override

8
core/src/main/java/io/bisq/core/dao/blockchain/BsqNode.java
View file

@ -26,7 +26,7 @@ import io.bisq.core.dao.blockchain.vo.BsqBlock;
import io.bisq.core.provider.fee.FeeService;
import io.bisq.network.p2p.P2PService;
import io.bisq.network.p2p.P2PServiceListener;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@ -47,7 +47,7 @@ public abstract class BsqNode {
protected final BsqParser bsqParser;
@SuppressWarnings("WeakerAccess")
protected final BsqBlockChain bsqBlockChain;
protected final SeedNodesRepository seedNodesRepository;
protected final SeedNodeRepository seedNodeRepository;
@SuppressWarnings("WeakerAccess")
protected final List<BsqBlockChainListener> bsqBlockChainListeners = new ArrayList<>();
protected final String genesisTxId;
@ -69,12 +69,12 @@ public abstract class BsqNode {
BsqParser bsqParser,
BsqBlockChain bsqBlockChain,
FeeService feeService,
SeedNodesRepository seedNodesRepository) {
SeedNodeRepository seedNodeRepository) {
this.p2PService = p2PService;
this.bsqParser = bsqParser;
this.bsqBlockChain = bsqBlockChain;
this.seedNodesRepository = seedNodesRepository;
this.seedNodeRepository = seedNodeRepository;
genesisTxId = bsqBlockChain.getGenesisTxId();
genesisBlockHeight = bsqBlockChain.getGenesisBlockHeight();

6
core/src/main/java/io/bisq/core/network/CoreSeedNodesRepository.java → core/src/main/java/io/bisq/core/network/CoreSeedNodeRepository.java
View file

@ -1,20 +1,20 @@
package io.bisq.core.network;
import io.bisq.network.p2p.NodeAddress;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import javax.inject.Inject;
import java.util.Set;
import java.util.stream.Stream;
public class CoreSeedNodesRepository implements SeedNodesRepository {
public class CoreSeedNodeRepository implements SeedNodeRepository {
private final Set<NodeAddress> seedNodeAddresses;
private final Set<NodeAddress> torSeedNodeAddresses;
private final Set<NodeAddress> localhostSeedNodeAddresses;
@Inject
public CoreSeedNodesRepository(NodeAddressLookup lookup) {
public CoreSeedNodeRepository(NodeAddressLookup lookup) {
this.seedNodeAddresses = lookup.resolveNodeAddresses();
this.torSeedNodeAddresses = DefaultNodeAddresses.DEFAULT_TOR_SEED_NODE_ADDRESSES;
this.localhostSeedNodeAddresses = DefaultNodeAddresses.DEFAULT_LOCALHOST_SEED_NODE_ADDRESSES;

6
gui/src/main/java/io/bisq/gui/app/BisqAppModule.java
View file

@ -31,7 +31,7 @@ import io.bisq.core.arbitration.ArbitratorModule;
import io.bisq.core.btc.BitcoinModule;
import io.bisq.core.dao.DaoModule;
import io.bisq.core.filter.FilterModule;
import io.bisq.core.network.CoreSeedNodesRepository;
import io.bisq.core.network.CoreSeedNodeRepository;
import io.bisq.core.network.NodeAddressLookup;
import io.bisq.core.offer.OfferModule;
import io.bisq.core.proto.network.CoreNetworkProtoResolver;
@ -45,7 +45,7 @@ import io.bisq.gui.main.overlays.notifications.NotificationCenter;
import io.bisq.network.crypto.EncryptionServiceModule;
import io.bisq.network.p2p.P2PModule;
import io.bisq.network.p2p.network.BridgeAddressProvider;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import javafx.stage.Stage;
import org.springframework.core.env.Environment;
@ -76,7 +76,7 @@ public class BisqAppModule extends AppModule {
bind(BridgeAddressProvider.class).to(Preferences.class).in(Singleton.class);
bind(NodeAddressLookup.class).in(Singleton.class);
bind(SeedNodesRepository.class).to(CoreSeedNodesRepository.class).in(Singleton.class);
bind(SeedNodeRepository.class).to(CoreSeedNodeRepository.class).in(Singleton.class);
File storageDir = new File(environment.getRequiredProperty(Storage.STORAGE_DIR));
bind(File.class).annotatedWith(named(Storage.STORAGE_DIR)).toInstance(storageDir);

6
monitor/src/main/java/io/bisq/monitor/MonitorModule.java
View file

@ -31,7 +31,7 @@ import io.bisq.core.arbitration.ArbitratorModule;
import io.bisq.core.btc.BitcoinModule;
import io.bisq.core.dao.DaoModule;
import io.bisq.core.filter.FilterModule;
import io.bisq.core.network.CoreSeedNodesRepository;
import io.bisq.core.network.CoreSeedNodeRepository;
import io.bisq.core.network.NodeAddressLookup;
import io.bisq.core.offer.OfferModule;
import io.bisq.core.proto.network.CoreNetworkProtoResolver;
@ -42,7 +42,7 @@ import io.bisq.core.user.User;
import io.bisq.monitor.metrics.p2p.MonitorP2PModule;
import io.bisq.network.crypto.EncryptionServiceModule;
import io.bisq.network.p2p.network.BridgeAddressProvider;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import org.springframework.core.env.Environment;
import java.io.File;
@ -72,7 +72,7 @@ class MonitorModule extends AppModule {
bind(BridgeAddressProvider.class).to(Preferences.class).in(Singleton.class);
bind(NodeAddressLookup.class).in(Singleton.class);
bind(SeedNodesRepository.class).to(CoreSeedNodesRepository.class).in(Singleton.class);
bind(SeedNodeRepository.class).to(CoreSeedNodeRepository.class).in(Singleton.class);
File storageDir = new File(environment.getRequiredProperty(Storage.STORAGE_DIR));
bind(File.class).annotatedWith(named(Storage.STORAGE_DIR)).toInstance(storageDir);

14
monitor/src/main/java/io/bisq/monitor/metrics/MetricsModel.java
View file

@ -24,7 +24,7 @@ import io.bisq.core.btc.BitcoinNodes;
import io.bisq.core.btc.wallet.WalletsSetup;
import io.bisq.monitor.MonitorOptionKeys;
import io.bisq.network.p2p.NodeAddress;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
@ -49,7 +49,7 @@ public class MetricsModel {
private String resultAsString;
@Getter
private String resultAsHtml;
private SeedNodesRepository seedNodesRepository;
private SeedNodeRepository seedNodeRepository;
private SlackApi slackSeedApi, slackBtcApi, slackProviderApi;
private BitcoinNodes bitcoinNodes;
@Setter
@ -64,13 +64,13 @@ public class MetricsModel {
private Set<NodeAddress> nodesInError = new HashSet<>();
@Inject
public MetricsModel(SeedNodesRepository seedNodesRepository,
public MetricsModel(SeedNodeRepository seedNodeRepository,
BitcoinNodes bitcoinNodes,
WalletsSetup walletsSetup,
@Named(MonitorOptionKeys.SLACK_URL_SEED_CHANNEL) String slackUrlSeedChannel,
@Named(MonitorOptionKeys.SLACK_BTC_SEED_CHANNEL) String slackUrlBtcChannel,
@Named(MonitorOptionKeys.SLACK_PROVIDER_SEED_CHANNEL) String slackUrlProviderChannel) {
this.seedNodesRepository = seedNodesRepository;
this.seedNodeRepository = seedNodeRepository;
this.bitcoinNodes = bitcoinNodes;
if (!slackUrlSeedChannel.isEmpty())
slackSeedApi = new SlackApi(slackUrlSeedChannel);
@ -99,7 +99,7 @@ public class MetricsModel {
Map<String, Double> accumulatedValues = new HashMap<>();
final double[] items = {0};
List<Map.Entry<NodeAddress, Metrics>> entryList = map.entrySet().stream()
.sorted(Comparator.comparing(entrySet -> seedNodesRepository.getOperator(entrySet.getKey())))
.sorted(Comparator.comparing(entrySet -> seedNodeRepository.getOperator(entrySet.getKey())))
.collect(Collectors.toList());
totalErrors = 0;
@ -166,7 +166,7 @@ public class MetricsModel {
if (averageOptional.isPresent())
durationAverage = averageOptional.getAsDouble() / 1000;
final NodeAddress nodeAddress = e.getKey();
final String operator = seedNodesRepository.getOperator(nodeAddress);
final String operator = seedNodeRepository.getOperator(nodeAddress);
final List<String> errorMessages = metrics.getErrorMessages();
final int numErrors = (int) errorMessages.stream().filter(s -> !s.isEmpty()).count();
int numRequests = allDurations.size();
@ -234,7 +234,7 @@ public class MetricsModel {
if (devAbs >= 20) {
if (slackSeedApi != null)
slackSeedApi.call(new SlackMessage("Warning: " + nodeAddress.getFullAddress(),
"<" + seedNodesRepository.getOperator(nodeAddress) + ">" + " Your seed node delivers diverging results for " + dataItem + ". " +
"<" + seedNodeRepository.getOperator(nodeAddress) + ">" + " Your seed node delivers diverging results for " + dataItem + ". " +
"Please check the monitoring status page at http://seedmonitor.0-2-1.net:8080/"));
}
});

14
monitor/src/main/java/io/bisq/monitor/metrics/p2p/MonitorRequestManager.java
View file

@ -10,7 +10,7 @@ import io.bisq.network.p2p.network.CloseConnectionReason;
import io.bisq.network.p2p.network.Connection;
import io.bisq.network.p2p.network.ConnectionListener;
import io.bisq.network.p2p.network.NetworkNode;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import io.bisq.network.p2p.storage.P2PDataStorage;
import lombok.extern.slf4j.Slf4j;
import net.gpedro.integrations.slack.SlackApi;
@ -38,7 +38,7 @@ public class MonitorRequestManager implements ConnectionListener {
private SlackApi slackApi;
private P2PDataStorage dataStorage;
private SeedNodesRepository seedNodesRepository;
private SeedNodeRepository seedNodeRepository;
private MetricsModel metricsModel;
private final Set<NodeAddress> seedNodeAddresses;
@ -55,19 +55,19 @@ public class MonitorRequestManager implements ConnectionListener {
@Inject
public MonitorRequestManager(NetworkNode networkNode,
P2PDataStorage dataStorage,
SeedNodesRepository seedNodesRepository,
SeedNodeRepository seedNodeRepository,
MetricsModel metricsModel,
@Named(MonitorOptionKeys.SLACK_URL_SEED_CHANNEL) String slackUrlSeedChannel) {
this.networkNode = networkNode;
this.dataStorage = dataStorage;
this.seedNodesRepository = seedNodesRepository;
this.seedNodeRepository = seedNodeRepository;
this.metricsModel = metricsModel;
if (!slackUrlSeedChannel.isEmpty())
slackApi = new SlackApi(slackUrlSeedChannel);
this.networkNode.addConnectionListener(this);
seedNodeAddresses = new HashSet<>(seedNodesRepository.getSeedNodeAddresses());
seedNodeAddresses = new HashSet<>(seedNodeRepository.getSeedNodeAddresses());
seedNodeAddresses.stream().forEach(nodeAddress -> metricsModel.addToMap(nodeAddress, new Metrics()));
numNodes = seedNodeAddresses.size();
}
@ -156,7 +156,7 @@ public class MonitorRequestManager implements ConnectionListener {
metricsModel.removeNodesInError(nodeAddress);
if (slackApi != null)
slackApi.call(new SlackMessage("Fixed: " + nodeAddress.getFullAddress(),
"<" + seedNodesRepository.getOperator(nodeAddress) + ">" + " Your seed node is recovered."));
"<" + seedNodeRepository.getOperator(nodeAddress) + ">" + " Your seed node is recovered."));
}
}
@ -189,7 +189,7 @@ public class MonitorRequestManager implements ConnectionListener {
if (slackApi != null)
slackApi.call(new SlackMessage("Error: " + nodeAddress.getFullAddress(),
"<" + seedNodesRepository.getOperator(nodeAddress) + ">" + " Your seed node failed " + RETRY_DELAY_SEC + " times with error message: " + errorMessage));
"<" + seedNodeRepository.getOperator(nodeAddress) + ">" + " Your seed node failed " + RETRY_DELAY_SEC + " times with error message: " + errorMessage));
}
}
});

10
network/src/main/java/io/bisq/network/p2p/P2PService.java
View file

@ -23,7 +23,7 @@ import io.bisq.network.p2p.peers.PeerManager;
import io.bisq.network.p2p.peers.getdata.RequestDataManager;
import io.bisq.network.p2p.peers.keepalive.KeepAliveManager;
import io.bisq.network.p2p.peers.peerexchange.PeerExchangeManager;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import io.bisq.network.p2p.storage.HashMapChangedListener;
import io.bisq.network.p2p.storage.P2PDataStorage;
import io.bisq.network.p2p.storage.messages.AddDataMessage;
@ -53,7 +53,7 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
private static final Logger log = LoggerFactory.getLogger(P2PService.class);
public static final int MAX_CONNECTIONS_DEFAULT = 12;
private final SeedNodesRepository seedNodesRepository;
private final SeedNodeRepository seedNodeRepository;
private final EncryptionService encryptionService;
private final KeyRing keyRing;
@ -97,7 +97,7 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
PeerExchangeManager peerExchangeManager,
KeepAliveManager keepAliveManager,
Broadcaster broadcaster,
SeedNodesRepository seedNodesRepository,
SeedNodeRepository seedNodeRepository,
Socks5ProxyProvider socks5ProxyProvider,
EncryptionService encryptionService,
KeyRing keyRing) {
@ -108,7 +108,7 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
this.peerExchangeManager = peerExchangeManager;
this.keepAliveManager = keepAliveManager;
this.broadcaster = broadcaster;
this.seedNodesRepository = seedNodesRepository;
this.seedNodeRepository = seedNodeRepository;
this.socks5ProxyProvider = socks5ProxyProvider;
this.encryptionService = encryptionService;
this.keyRing = keyRing;
@ -468,7 +468,7 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
Log.traceCall();
final NodeAddress nodeAddress = networkNode.getNodeAddress();
// Seed nodes don't receive mailbox network_messages
if (nodeAddress != null && !seedNodesRepository.isSeedNode(nodeAddress)) {
if (nodeAddress != null && !seedNodeRepository.isSeedNode(nodeAddress)) {
Log.traceCall();
MailboxStoragePayload mailboxStoragePayload = protectedMailboxStorageEntry.getMailboxStoragePayload();
PrefixedSealedAndSignedMessage prefixedSealedAndSignedMessage = mailboxStoragePayload.getPrefixedSealedAndSignedMessage();

6
network/src/main/java/io/bisq/network/p2p/peers/PeerManager.java
View file

@ -13,7 +13,7 @@ import io.bisq.network.p2p.NodeAddress;
import io.bisq.network.p2p.network.*;
import io.bisq.network.p2p.peers.peerexchange.Peer;
import io.bisq.network.p2p.peers.peerexchange.PeerList;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@ -92,13 +92,13 @@ public class PeerManager implements ConnectionListener, PersistedDataHost {
@Inject
public PeerManager(NetworkNode networkNode,
SeedNodesRepository seedNodesRepository,
SeedNodeRepository seedNodeRepository,
Clock clock,
PersistenceProtoResolver persistenceProtoResolver,
@Named(NetworkOptionKeys.MAX_CONNECTIONS) int maxConnections,
@Named(Storage.STORAGE_DIR) File storageDir) {
this.networkNode = networkNode;
this.seedNodeAddresses = new HashSet<>(seedNodesRepository.getSeedNodeAddresses());
this.seedNodeAddresses = new HashSet<>(seedNodeRepository.getSeedNodeAddresses());
this.clock = clock;
storage = new Storage<>(storageDir, persistenceProtoResolver);

8
network/src/main/java/io/bisq/network/p2p/peers/getdata/RequestDataManager.java
View file

@ -11,7 +11,7 @@ import io.bisq.network.p2p.network.*;
import io.bisq.network.p2p.peers.PeerManager;
import io.bisq.network.p2p.peers.getdata.messages.GetDataRequest;
import io.bisq.network.p2p.peers.peerexchange.Peer;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import io.bisq.network.p2p.storage.P2PDataStorage;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.Nullable;
@ -74,7 +74,7 @@ public class RequestDataManager implements MessageListener, ConnectionListener,
@Inject
public RequestDataManager(NetworkNode networkNode,
SeedNodesRepository seedNodesRepository,
SeedNodeRepository seedNodeRepository,
P2PDataStorage dataStorage,
PeerManager peerManager,
@javax.annotation.Nullable @Named(NetworkOptionKeys.MY_ADDRESS) String myAddress) {
@ -86,13 +86,13 @@ public class RequestDataManager implements MessageListener, ConnectionListener,
this.networkNode.addConnectionListener(this);
this.peerManager.addListener(this);
this.seedNodeAddresses = new HashSet<>(seedNodesRepository.getSeedNodeAddresses());
this.seedNodeAddresses = new HashSet<>(seedNodeRepository.getSeedNodeAddresses());
// If we are a seed node we use more redundancy at startup to be sure we get all data.
// We cannot use networkNode.getNodeAddress() as nodeAddress as that is null at this point, so we use
// new NodeAddress(myAddress) for checking if we are a seed node.
// seedNodeAddresses do not contain my own address as that gets filtered out
if (myAddress != null && !myAddress.isEmpty() && seedNodesRepository.isSeedNode(new NodeAddress(myAddress))) {
if (myAddress != null && !myAddress.isEmpty() && seedNodeRepository.isSeedNode(new NodeAddress(myAddress))) {
NUM_SEEDS_FOR_PRELIMINARY_REQUEST = 3;
NUM_ADDITIONAL_SEEDS_FOR_UPDATE_REQUEST = 2;
}

6
network/src/main/java/io/bisq/network/p2p/peers/peerexchange/PeerExchangeManager.java
View file

@ -9,7 +9,7 @@ import io.bisq.network.p2p.NodeAddress;
import io.bisq.network.p2p.network.*;
import io.bisq.network.p2p.peers.PeerManager;
import io.bisq.network.p2p.peers.peerexchange.messages.GetPeersRequest;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable;
@ -40,7 +40,7 @@ public class PeerExchangeManager implements MessageListener, ConnectionListener,
@Inject
public PeerExchangeManager(NetworkNode networkNode,
SeedNodesRepository seedNodesRepository,
SeedNodeRepository seedNodeRepository,
PeerManager peerManager) {
this.networkNode = networkNode;
this.peerManager = peerManager;
@ -49,7 +49,7 @@ public class PeerExchangeManager implements MessageListener, ConnectionListener,
this.networkNode.addConnectionListener(this);
this.peerManager.addListener(this);
this.seedNodeAddresses = new HashSet<>(seedNodesRepository.getSeedNodeAddresses());
this.seedNodeAddresses = new HashSet<>(seedNodeRepository.getSeedNodeAddresses());
}
public void shutDown() {

2
network/src/main/java/io/bisq/network/p2p/seed/SeedNodesRepository.java → network/src/main/java/io/bisq/network/p2p/seed/SeedNodeRepository.java
View file

@ -21,7 +21,7 @@ import io.bisq.network.p2p.NodeAddress;
import java.util.Set;
public interface SeedNodesRepository {
public interface SeedNodeRepository {
boolean isSeedNode(NodeAddress nodeAddress);

2
network/src/test/java/io/bisq/network/p2p/DummySeedNode.java
View file

@ -168,7 +168,7 @@ public class DummySeedNode {
Utilities.printSysInfo();
Log.setLevel(logLevel);
/* SeedNodesRepository seedNodesRepository = new SeedNodesRepository();
/* SeedNodeRepository seedNodesRepository = new SeedNodeRepository();
if (progArgSeedNodes != null && !progArgSeedNodes.isEmpty()) {
if (useLocalhostForP2P)
seedNodesRepository.setLocalhostSeedNodeAddresses(progArgSeedNodes);

2
network/src/test/java/io/bisq/network/p2p/TestUtils.java
View file

@ -95,7 +95,7 @@ public class TestUtils {
boolean useLocalhostForP2P, Set<NodeAddress> seedNodes)
throws InterruptedException {
CountDownLatch latch = new CountDownLatch(1);
SeedNodesRepository seedNodesRepository = new SeedNodesRepository();
SeedNodeRepository seedNodesRepository = new SeedNodeRepository();
if (seedNodes != null && !seedNodes.isEmpty()) {
if (useLocalhostForP2P)
seedNodesRepository.setLocalhostSeedNodeAddresses(seedNodes);

6
seednode/src/main/java/io/bisq/seednode/SeedNodeModule.java
View file

@ -31,7 +31,7 @@ import io.bisq.core.arbitration.ArbitratorModule;
import io.bisq.core.btc.BitcoinModule;
import io.bisq.core.dao.DaoModule;
import io.bisq.core.filter.FilterModule;
import io.bisq.core.network.CoreSeedNodesRepository;
import io.bisq.core.network.CoreSeedNodeRepository;
import io.bisq.core.network.NodeAddressLookup;
import io.bisq.core.offer.OfferModule;
import io.bisq.core.proto.network.CoreNetworkProtoResolver;
@ -42,7 +42,7 @@ import io.bisq.core.user.User;
import io.bisq.network.crypto.EncryptionServiceModule;
import io.bisq.network.p2p.P2PModule;
import io.bisq.network.p2p.network.BridgeAddressProvider;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import org.springframework.core.env.Environment;
import java.io.File;
@ -71,7 +71,7 @@ class SeedNodeModule extends AppModule {
bind(BridgeAddressProvider.class).to(Preferences.class).in(Singleton.class);
bind(NodeAddressLookup.class).in(Singleton.class);
bind(SeedNodesRepository.class).to(CoreSeedNodesRepository.class).in(Singleton.class);
bind(SeedNodeRepository.class).to(CoreSeedNodeRepository.class).in(Singleton.class);
File storageDir = new File(environment.getRequiredProperty(Storage.STORAGE_DIR));
bind(File.class).annotatedWith(named(Storage.STORAGE_DIR)).toInstance(storageDir);

6
statistics/src/main/java/io/bisq/statistics/StatisticsModule.java
View file

@ -31,7 +31,7 @@ import io.bisq.core.arbitration.ArbitratorModule;
import io.bisq.core.btc.BitcoinModule;
import io.bisq.core.dao.DaoModule;
import io.bisq.core.filter.FilterModule;
import io.bisq.core.network.CoreSeedNodesRepository;
import io.bisq.core.network.CoreSeedNodeRepository;
import io.bisq.core.network.NodeAddressLookup;
import io.bisq.core.offer.OfferModule;
import io.bisq.core.proto.network.CoreNetworkProtoResolver;
@ -42,7 +42,7 @@ import io.bisq.core.user.User;
import io.bisq.network.crypto.EncryptionServiceModule;
import io.bisq.network.p2p.P2PModule;
import io.bisq.network.p2p.network.BridgeAddressProvider;
import io.bisq.network.p2p.seed.SeedNodesRepository;
import io.bisq.network.p2p.seed.SeedNodeRepository;
import org.springframework.core.env.Environment;
import java.io.File;
@ -71,7 +71,7 @@ class StatisticsModule extends AppModule {
bind(BridgeAddressProvider.class).to(Preferences.class).in(Singleton.class);
bind(NodeAddressLookup.class).in(Singleton.class);
bind(SeedNodesRepository.class).to(CoreSeedNodesRepository.class).in(Singleton.class);
bind(SeedNodeRepository.class).to(CoreSeedNodeRepository.class).in(Singleton.class);
File storageDir = new File(environment.getRequiredProperty(Storage.STORAGE_DIR));
bind(File.class).annotatedWith(named(Storage.STORAGE_DIR)).toInstance(storageDir);