Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-30 18:28:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

rename all packages and other names from bisq to haveno

Browse source
This commit is contained in:
woodser 2023-03-06 19:14:00 -05:00
parent ab0b9e3b77
commit 1a1fb130c0
1775 changed files with 14575 additions and 16767 deletions
Download patch file Download diff file Expand all files Collapse all files

6
monitor/src/main/java/bisq/monitor/AvailableTor.java → monitor/src/main/java/haveno/monitor/AvailableTor.java
View file

@ -15,12 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
import bisq.network.p2p.network.TorMode;
package haveno.monitor;
import org.berndpruenster.netlayer.tor.Tor;
import haveno.network.p2p.network.TorMode;
import java.io.File;
/**

2
monitor/src/main/java/bisq/monitor/Configurable.java → monitor/src/main/java/haveno/monitor/Configurable.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
package haveno.monitor;
import java.util.Properties;

9
monitor/src/main/java/bisq/monitor/Metric.java → monitor/src/main/java/haveno/monitor/Metric.java
View file

@ -15,11 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
package haveno.monitor;
import bisq.common.app.Version;
import bisq.common.util.Utilities;
import static haveno.common.config.Config.BASE_CURRENCY_NETWORK;
import haveno.common.app.Version;
import haveno.common.util.Utilities;
import java.util.Properties;
import java.util.Random;
import java.util.concurrent.ScheduledExecutorService;
@ -29,8 +30,6 @@ import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
import static bisq.common.config.Config.BASE_CURRENCY_NETWORK;
/**
* Starts a Metric (in its own {@link Thread}), manages its properties and shuts
* it down gracefully. Furthermore, configuration updates and execution are done

32
monitor/src/main/java/bisq/monitor/Monitor.java → monitor/src/main/java/haveno/monitor/Monitor.java
View file

@ -15,23 +15,21 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
import bisq.monitor.metric.MarketStats;
import bisq.monitor.metric.P2PMarketStats;
import bisq.monitor.metric.P2PNetworkLoad;
import bisq.monitor.metric.P2PRoundTripTime;
import bisq.monitor.metric.P2PSeedNodeSnapshot;
import bisq.monitor.metric.PriceNodeStats;
import bisq.monitor.metric.TorHiddenServiceStartupTime;
import bisq.monitor.metric.TorRoundTripTime;
import bisq.monitor.metric.TorStartupTime;
import bisq.monitor.reporter.ConsoleReporter;
import bisq.monitor.reporter.GraphiteReporter;
import bisq.common.app.Capabilities;
import bisq.common.app.Capability;
package haveno.monitor;
import haveno.common.app.Capabilities;
import haveno.common.app.Capability;
import haveno.monitor.metric.MarketStats;
import haveno.monitor.metric.P2PMarketStats;
import haveno.monitor.metric.P2PNetworkLoad;
import haveno.monitor.metric.P2PRoundTripTime;
import haveno.monitor.metric.P2PSeedNodeSnapshot;
import haveno.monitor.metric.PriceNodeStats;
import haveno.monitor.metric.TorHiddenServiceStartupTime;
import haveno.monitor.metric.TorRoundTripTime;
import haveno.monitor.metric.TorStartupTime;
import haveno.monitor.reporter.ConsoleReporter;
import haveno.monitor.reporter.GraphiteReporter;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
@ -51,7 +49,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import sun.misc.Signal;
/**
* Monitor executable for the Bisq network.
* Monitor executable for the Haveno network.
*
* @author Florian Reimair
*/

5
monitor/src/main/java/bisq/monitor/OnionParser.java → monitor/src/main/java/haveno/monitor/OnionParser.java
View file

@ -15,10 +15,9 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
import bisq.network.p2p.NodeAddress;
package haveno.monitor;
import haveno.network.p2p.NodeAddress;
import java.net.MalformedURLException;
import java.net.URL;

2
monitor/src/main/java/bisq/monitor/Reporter.java → monitor/src/main/java/haveno/monitor/Reporter.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
package haveno.monitor;
import java.util.Map;

2
monitor/src/main/java/bisq/monitor/StatisticsHelper.java → monitor/src/main/java/haveno/monitor/StatisticsHelper.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
package haveno.monitor;
import java.util.ArrayList;
import java.util.Collection;

2
monitor/src/main/java/bisq/monitor/ThreadGate.java → monitor/src/main/java/haveno/monitor/ThreadGate.java
View file

@ -15,7 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
package haveno.monitor;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

12
monitor/src/main/java/bisq/monitor/metric/MarketStats.java → monitor/src/main/java/haveno/monitor/metric/MarketStats.java
View file

@ -15,14 +15,12 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.metric;
import bisq.monitor.Metric;
import bisq.monitor.Reporter;
package haveno.monitor.metric;
import java.net.URL;
import java.net.URLConnection;
import haveno.monitor.Metric;
import haveno.monitor.Reporter;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@ -44,7 +42,7 @@ import lombok.extern.slf4j.Slf4j;
*/
@Slf4j
public class MarketStats extends Metric {
private static final String MARKETS_BISQ_NETWORK = "https://markets.bisq.network";
private static final String MARKETS_HAVENO_NETWORK = "https://markets.bisq.network";
// poor mans JSON parser
private final Pattern marketPattern = Pattern.compile("\"market\" ?: ?\"([a-z_]+)\"");
private final Pattern amountPattern = Pattern.compile("\"amount\" ?: ?\"([\\d\\.]+)\"");
@ -69,7 +67,7 @@ public class MarketStats extends Metric {
lastRun = now; // thought about adding 1 second but what if a trade is done exactly in this one second?
// connect
URLConnection connection = new URL(MARKETS_BISQ_NETWORK + query).openConnection();
URLConnection connection = new URL(MARKETS_HAVENO_NETWORK + query).openConnection();
// prepare to receive data
BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));

24
monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java → monitor/src/main/java/haveno/monitor/metric/P2PMarketStats.java
View file

@ -15,21 +15,17 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.metric;
import bisq.monitor.Reporter;
import bisq.core.offer.OfferPayload;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.peers.getdata.messages.GetDataResponse;
import bisq.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.monitor.metric;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.core.offer.OfferPayload;
import haveno.monitor.Reporter;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.peers.getdata.messages.GetDataResponse;
import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

52
monitor/src/main/java/bisq/monitor/metric/P2PNetworkLoad.java → monitor/src/main/java/haveno/monitor/metric/P2PNetworkLoad.java
View file

@ -15,35 +15,31 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.metric;
import bisq.monitor.AvailableTor;
import bisq.monitor.Metric;
import bisq.monitor.Monitor;
import bisq.monitor.Reporter;
import bisq.monitor.ThreadGate;
import bisq.core.network.p2p.seed.DefaultSeedNodeRepository;
import bisq.core.proto.network.CoreNetworkProtoResolver;
import bisq.core.proto.persistable.CorePersistenceProtoResolver;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.MessageListener;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.network.SetupListener;
import bisq.network.p2p.network.TorNetworkNode;
import bisq.network.p2p.peers.PeerManager;
import bisq.network.p2p.peers.keepalive.KeepAliveManager;
import bisq.network.p2p.peers.peerexchange.PeerExchangeManager;
import bisq.network.p2p.storage.messages.BroadcastMessage;
import bisq.common.ClockWatcher;
import bisq.common.config.Config;
import bisq.common.file.CorruptedStorageFileHandler;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.network.NetworkProtoResolver;
package haveno.monitor.metric;
import haveno.common.ClockWatcher;
import haveno.common.config.Config;
import haveno.common.file.CorruptedStorageFileHandler;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.common.proto.network.NetworkProtoResolver;
import haveno.core.network.p2p.seed.DefaultSeedNodeRepository;
import haveno.core.proto.network.CoreNetworkProtoResolver;
import haveno.core.proto.persistable.CorePersistenceProtoResolver;
import haveno.monitor.AvailableTor;
import haveno.monitor.Metric;
import haveno.monitor.Monitor;
import haveno.monitor.Reporter;
import haveno.monitor.ThreadGate;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.network.SetupListener;
import haveno.network.p2p.network.TorNetworkNode;
import haveno.network.p2p.peers.PeerManager;
import haveno.network.p2p.peers.keepalive.KeepAliveManager;
import haveno.network.p2p.peers.peerexchange.PeerExchangeManager;
import haveno.network.p2p.storage.messages.BroadcastMessage;
import java.time.Clock;
import java.io.File;

23
monitor/src/main/java/bisq/monitor/metric/P2PRoundTripTime.java → monitor/src/main/java/haveno/monitor/metric/P2PRoundTripTime.java
View file

@ -15,20 +15,17 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.metric;
import bisq.monitor.OnionParser;
import bisq.monitor.Reporter;
import bisq.monitor.StatisticsHelper;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.CloseConnectionReason;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.peers.keepalive.messages.Ping;
import bisq.network.p2p.peers.keepalive.messages.Pong;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.monitor.metric;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.monitor.OnionParser;
import haveno.monitor.Reporter;
import haveno.monitor.StatisticsHelper;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.CloseConnectionReason;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.peers.keepalive.messages.Ping;
import haveno.network.p2p.peers.keepalive.messages.Pong;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

22
monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshot.java → monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshot.java
View file

@ -15,19 +15,17 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.metric;
import bisq.monitor.OnionParser;
import bisq.monitor.Reporter;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.peers.getdata.messages.GetDataResponse;
import bisq.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest;
import bisq.network.p2p.storage.payload.ProtectedStorageEntry;
import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.monitor.metric;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.monitor.OnionParser;
import haveno.monitor.Reporter;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.peers.getdata.messages.GetDataResponse;
import haveno.network.p2p.peers.getdata.messages.PreliminaryGetDataRequest;
import haveno.network.p2p.storage.payload.ProtectedStorageEntry;
import haveno.network.p2p.storage.payload.ProtectedStoragePayload;
import java.net.MalformedURLException;
import java.nio.ByteBuffer;

47
monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshotBase.java → monitor/src/main/java/haveno/monitor/metric/P2PSeedNodeSnapshotBase.java
View file

@ -15,37 +15,32 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.metric;
import bisq.monitor.AvailableTor;
import bisq.monitor.Metric;
import bisq.monitor.Monitor;
import bisq.monitor.OnionParser;
import bisq.monitor.Reporter;
import bisq.monitor.ThreadGate;
import bisq.core.account.witness.AccountAgeWitnessStore;
import bisq.core.proto.network.CoreNetworkProtoResolver;
import bisq.core.proto.persistable.CorePersistenceProtoResolver;
import bisq.core.trade.statistics.TradeStatistics3Store;
import bisq.network.p2p.CloseConnectionMessage;
import bisq.network.p2p.NodeAddress;
import bisq.network.p2p.network.Connection;
import bisq.network.p2p.network.MessageListener;
import bisq.network.p2p.network.NetworkNode;
import bisq.network.p2p.network.TorNetworkNode;
import bisq.common.app.Version;
import bisq.common.config.BaseCurrencyNetwork;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.network.NetworkEnvelope;
package haveno.monitor.metric;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import haveno.common.app.Version;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.common.persistence.PersistenceManager;
import haveno.common.proto.network.NetworkEnvelope;
import haveno.core.account.witness.AccountAgeWitnessStore;
import haveno.core.proto.network.CoreNetworkProtoResolver;
import haveno.core.proto.persistable.CorePersistenceProtoResolver;
import haveno.core.trade.statistics.TradeStatistics3Store;
import haveno.monitor.AvailableTor;
import haveno.monitor.Metric;
import haveno.monitor.Monitor;
import haveno.monitor.OnionParser;
import haveno.monitor.Reporter;
import haveno.monitor.ThreadGate;
import haveno.network.p2p.CloseConnectionMessage;
import haveno.network.p2p.NodeAddress;
import haveno.network.p2p.network.Connection;
import haveno.network.p2p.network.MessageListener;
import haveno.network.p2p.network.NetworkNode;
import haveno.network.p2p.network.TorNetworkNode;
import java.time.Clock;
import java.io.File;

18
monitor/src/main/java/bisq/monitor/metric/PriceNodeStats.java → monitor/src/main/java/haveno/monitor/metric/PriceNodeStats.java
View file

@ -15,23 +15,19 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.metric;
import bisq.monitor.Metric;
import bisq.monitor.OnionParser;
import bisq.monitor.Reporter;
import bisq.asset.Asset;
import bisq.asset.AssetRegistry;
import bisq.network.p2p.NodeAddress;
package haveno.monitor.metric;
import org.berndpruenster.netlayer.tor.Tor;
import org.berndpruenster.netlayer.tor.TorCtlException;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import com.runjva.sourceforge.jsocks.protocol.SocksSocket;
import haveno.asset.Asset;
import haveno.asset.AssetRegistry;
import haveno.monitor.Metric;
import haveno.monitor.OnionParser;
import haveno.monitor.Reporter;
import haveno.network.p2p.NodeAddress;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;

12
monitor/src/main/java/bisq/monitor/metric/TorHiddenServiceStartupTime.java → monitor/src/main/java/haveno/monitor/metric/TorHiddenServiceStartupTime.java
View file

@ -15,15 +15,13 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.metric;
import bisq.monitor.Metric;
import bisq.monitor.Monitor;
import bisq.monitor.Reporter;
import bisq.monitor.ThreadGate;
package haveno.monitor.metric;
import org.berndpruenster.netlayer.tor.HiddenServiceSocket;
import haveno.monitor.Metric;
import haveno.monitor.Monitor;
import haveno.monitor.Reporter;
import haveno.monitor.ThreadGate;
import java.io.File;
import lombok.extern.slf4j.Slf4j;

17
monitor/src/main/java/bisq/monitor/metric/TorRoundTripTime.java → monitor/src/main/java/haveno/monitor/metric/TorRoundTripTime.java
View file

@ -15,21 +15,18 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.metric;
import bisq.monitor.Metric;
import bisq.monitor.OnionParser;
import bisq.monitor.Reporter;
import bisq.monitor.StatisticsHelper;
import bisq.network.p2p.NodeAddress;
package haveno.monitor.metric;
import org.berndpruenster.netlayer.tor.Tor;
import org.berndpruenster.netlayer.tor.TorCtlException;
import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
import com.runjva.sourceforge.jsocks.protocol.SocksSocket;
import haveno.monitor.Metric;
import haveno.monitor.OnionParser;
import haveno.monitor.Reporter;
import haveno.monitor.StatisticsHelper;
import haveno.network.p2p.NodeAddress;
import java.io.IOException;
import java.util.ArrayList;
@ -38,7 +35,7 @@ import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
/**
* A Metric to measure the round-trip time to the Bisq seed nodes via plain tor.
* A Metric to measure the round-trip time to the Haveno seed nodes via plain tor.
*
* @author Florian Reimair
*/

8
monitor/src/main/java/bisq/monitor/metric/TorStartupTime.java → monitor/src/main/java/haveno/monitor/metric/TorStartupTime.java
View file

@ -15,16 +15,14 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.metric;
import bisq.monitor.Metric;
import bisq.monitor.Reporter;
package haveno.monitor.metric;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
import org.berndpruenster.netlayer.tor.TorCtlException;
import org.berndpruenster.netlayer.tor.Torrc;
import haveno.monitor.Metric;
import haveno.monitor.Reporter;
import java.io.File;
import java.io.IOException;

12
monitor/src/main/java/bisq/monitor/reporter/ConsoleReporter.java → monitor/src/main/java/haveno/monitor/reporter/ConsoleReporter.java
View file

@ -15,13 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.reporter;
import bisq.monitor.Reporter;
import bisq.common.app.Version;
import bisq.common.config.BaseCurrencyNetwork;
package haveno.monitor.reporter;
import haveno.common.app.Version;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.monitor.Reporter;
import java.util.HashMap;
import java.util.Map;
@ -57,7 +55,7 @@ public class ConsoleReporter extends Reporter {
@Override
public void report(String key, String value, String timestamp, String prefix) {
System.err.println("Report: bisq" + (Version.getBaseCurrencyNetwork() != 0 ? "-" + BaseCurrencyNetwork.values()[Version.getBaseCurrencyNetwork()].getNetwork() : "")
System.err.println("Report: haveno" + (Version.getBaseCurrencyNetwork() != 0 ? "-" + BaseCurrencyNetwork.values()[Version.getBaseCurrencyNetwork()].getNetwork() : "")
+ (prefix.isEmpty() ? "" : "." + prefix)
+ (key.isEmpty() ? "" : "." + key)
+ " " + value + " " + timestamp);

18
monitor/src/main/java/bisq/monitor/reporter/GraphiteReporter.java → monitor/src/main/java/haveno/monitor/reporter/GraphiteReporter.java
View file

@ -15,20 +15,16 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor.reporter;
import bisq.monitor.OnionParser;
import bisq.monitor.Reporter;
import bisq.network.p2p.NodeAddress;
import bisq.common.app.Version;
import bisq.common.config.BaseCurrencyNetwork;
package haveno.monitor.reporter;
import org.berndpruenster.netlayer.tor.TorSocket;
import com.google.common.base.Charsets;
import haveno.common.app.Version;
import haveno.common.config.BaseCurrencyNetwork;
import haveno.monitor.OnionParser;
import haveno.monitor.Reporter;
import haveno.network.p2p.NodeAddress;
import java.net.Socket;
import java.io.IOException;
@ -77,7 +73,7 @@ public class GraphiteReporter extends Reporter {
@Override
public void report(String key, String value, String timeInMilliseconds, String prefix) {
// https://graphite.readthedocs.io/en/latest/feeding-carbon.html
String report = "bisq" + (Version.getBaseCurrencyNetwork() != 0 ? "-" + BaseCurrencyNetwork.values()[Version.getBaseCurrencyNetwork()].getNetwork() : "")
String report = "haveno" + (Version.getBaseCurrencyNetwork() != 0 ? "-" + BaseCurrencyNetwork.values()[Version.getBaseCurrencyNetwork()].getNetwork() : "")
+ (prefix.isEmpty() ? "" : "." + prefix)
+ (key.isEmpty() ? "" : "." + key)
+ " " + value + " " + Long.parseLong(timeInMilliseconds) / 1000 + "\n";

4
monitor/src/main/resources/metrics.properties
View file

@ -47,7 +47,7 @@ P2PNetworkLoad.run.historySize=200
#P2PSeedNodeSnapshotBase Metric
P2PSeedNodeSnapshot.enabled=true
P2PSeedNodeSnapshot.run.dbDir=bisq/p2p/build/resources/main/
P2PSeedNodeSnapshot.run.dbDir=haveno/p2p/build/resources/main/
P2PSeedNodeSnapshot.run.interval=24
P2PSeedNodeSnapshot.run.hosts=3f3cu2yw7u457ztq.onion:8000, 723ljisnynbtdohi.onion:8000, fl3mmribyxgrv63c.onion:8000
P2PSeedNodeSnapshot.run.torProxyPort=9062
@ -55,7 +55,7 @@ P2PSeedNodeSnapshot.run.torProxyPort=9062
#P2PMarketStats Metric
P2PMarketStats.enabled=false
P2PMarketStats.run.interval=37
P2PMarketStats.run.dbDir=bisq/p2p/build/resources/main/
P2PMarketStats.run.dbDir=haveno/p2p/build/resources/main/
P2PMarketStats.run.hosts=ef5qnzx6znifo3df.onion:8000
P2PMarketStats.run.torProxyPort=9063

6
monitor/src/test/java/bisq/monitor/MonitorInfrastructureTests.java → monitor/src/test/java/haveno/monitor/MonitorInfrastructureTests.java
View file

@ -15,10 +15,10 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
import bisq.monitor.reporter.ConsoleReporter;
package haveno.monitor;
import haveno.monitor.Metric;
import haveno.monitor.reporter.ConsoleReporter;
import java.util.HashMap;
import java.util.Properties;
import java.util.concurrent.ExecutionException;

10
monitor/src/test/java/bisq/monitor/P2PNetworkLoadTests.java → monitor/src/test/java/haveno/monitor/P2PNetworkLoadTests.java
View file

@ -15,10 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
import bisq.monitor.metric.P2PNetworkLoad;
import bisq.monitor.reporter.ConsoleReporter;
package haveno.monitor;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
@ -35,6 +32,11 @@ import org.junit.jupiter.api.Test;
import static com.google.common.base.Preconditions.checkNotNull;
import haveno.monitor.Metric;
import haveno.monitor.Monitor;
import haveno.monitor.metric.P2PNetworkLoad;
import haveno.monitor.reporter.ConsoleReporter;
/**
* Test the round trip time metric against the hidden service of tor project.org.
*

10
monitor/src/test/java/bisq/monitor/P2PRoundTripTimeTests.java → monitor/src/test/java/haveno/monitor/P2PRoundTripTimeTests.java
View file

@ -15,10 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
import bisq.monitor.metric.P2PRoundTripTime;
import bisq.monitor.reporter.ConsoleReporter;
package haveno.monitor;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
@ -36,6 +33,11 @@ import org.junit.jupiter.params.provider.ValueSource;
import static com.google.common.base.Preconditions.checkNotNull;
import haveno.monitor.Metric;
import haveno.monitor.Monitor;
import haveno.monitor.metric.P2PRoundTripTime;
import haveno.monitor.reporter.ConsoleReporter;
/**
* Test the round trip time metric against the hidden service of tor project.org.
*

8
monitor/src/test/java/bisq/monitor/PriceNodeStatsTests.java → monitor/src/test/java/haveno/monitor/PriceNodeStatsTests.java
View file

@ -15,9 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
import bisq.monitor.metric.PriceNodeStats;
package haveno.monitor;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
@ -36,6 +34,10 @@ import org.junit.jupiter.api.Test;
import static com.google.common.base.Preconditions.checkNotNull;
import haveno.monitor.Metric;
import haveno.monitor.Reporter;
import haveno.monitor.metric.PriceNodeStats;
/**
* @author Florian Reimair
*/

8
monitor/src/test/java/bisq/monitor/TorHiddenServiceStartupTimeTests.java → monitor/src/test/java/haveno/monitor/TorHiddenServiceStartupTimeTests.java
View file

@ -15,9 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
import bisq.monitor.metric.TorHiddenServiceStartupTime;
package haveno.monitor;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
@ -36,6 +34,10 @@ import org.junit.jupiter.api.Test;
import static com.google.common.base.Preconditions.checkNotNull;
import haveno.monitor.Metric;
import haveno.monitor.Reporter;
import haveno.monitor.metric.TorHiddenServiceStartupTime;
@Disabled // Ignore for normal test runs as the tests take lots of time
public class TorHiddenServiceStartupTimeTests {

8
monitor/src/test/java/bisq/monitor/TorRoundTripTimeTests.java → monitor/src/test/java/haveno/monitor/TorRoundTripTimeTests.java
View file

@ -15,9 +15,7 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
import bisq.monitor.metric.TorRoundTripTime;
package haveno.monitor;
import org.berndpruenster.netlayer.tor.NativeTor;
import org.berndpruenster.netlayer.tor.Tor;
@ -37,6 +35,10 @@ import org.junit.jupiter.params.provider.ValueSource;
import static com.google.common.base.Preconditions.checkNotNull;
import haveno.monitor.Metric;
import haveno.monitor.Reporter;
import haveno.monitor.metric.TorRoundTripTime;
/**
* Test the round trip time metric against the hidden service of tor project.org.
*

7
monitor/src/test/java/bisq/monitor/TorStartupTimeTests.java → monitor/src/test/java/haveno/monitor/TorStartupTimeTests.java
View file

@ -15,10 +15,11 @@
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.monitor;
import bisq.monitor.metric.TorStartupTime;
package haveno.monitor;
import haveno.monitor.Metric;
import haveno.monitor.Reporter;
import haveno.monitor.metric.TorStartupTime;
import java.util.Map;
import java.util.Properties;