Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-05-02 14:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

rename classes and executables from Bisq* to Haveno*

Browse source
This commit is contained in:
woodser 2021-12-15 12:38:41 -05:00
parent 7c9c35b1b8
commit 1be8e53ee9
72 changed files with 235 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apitest/src/main/java/bisq/apitest/Scaffold.java
View file

@ -17,7 +17,7 @@
package bisq.apitest;
import bisq.common.config.BisqHelpFormatter;
import bisq.common.config.HavenoHelpFormatter;
import bisq.common.util.Utilities;
import java.nio.file.Files;
@ -44,7 +44,7 @@ import javax.annotation.Nullable;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.ApiTestConfig.MEDIATOR;
import static bisq.apitest.config.ApiTestConfig.REFUND_AGENT;
import static bisq.apitest.config.BisqAppConfig.*;
import static bisq.apitest.config.HavenoAppConfig.*;
import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY;
import static java.lang.String.format;
import static java.lang.System.exit;
@ -57,9 +57,9 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import bisq.apitest.config.ApiTestConfig;
import bisq.apitest.config.BisqAppConfig;
import bisq.apitest.config.HavenoAppConfig;
import bisq.apitest.linux.BashCommand;
import bisq.apitest.linux.BisqProcess;
import bisq.apitest.linux.HavenoProcess;
import bisq.apitest.linux.BitcoinDaemon;
import bisq.apitest.linux.LinuxProcess;
import bisq.cli.GrpcClient;
@ -129,7 +129,7 @@ public class Scaffold {
this.executor = Executors.newFixedThreadPool(config.supportingApps.size());
if (config.helpRequested) {
config.printHelp(out,
new BisqHelpFormatter(
new HavenoHelpFormatter(
"Bisq ApiTest",
"bisq-apitest",
"0.1.0"));
@ -289,12 +289,12 @@ public class Scaffold {
startBisqApp(bobdesktop, executor, countdownLatch);
}
private void startBisqApp(BisqAppConfig bisqAppConfig,
private void startBisqApp(HavenoAppConfig bisqAppConfig,
ExecutorService executor,
CountDownLatch countdownLatch)
throws IOException, InterruptedException {
BisqProcess bisqProcess = createBisqProcess(bisqAppConfig);
HavenoProcess bisqProcess = createBisqProcess(bisqAppConfig);
switch (bisqAppConfig) {
case seednode:
seedNodeTask = new SetupTask(bisqProcess, countdownLatch);
@ -326,9 +326,9 @@ public class Scaffold {
}
}
private BisqProcess createBisqProcess(BisqAppConfig bisqAppConfig)
private HavenoProcess createBisqProcess(HavenoAppConfig bisqAppConfig)
throws IOException, InterruptedException {
BisqProcess bisqProcess = new BisqProcess(bisqAppConfig, config);
HavenoProcess bisqProcess = new HavenoProcess(bisqAppConfig, config);
bisqProcess.verifyAppNotRunning();
bisqProcess.verifyAppDataDirInstalled();
return bisqProcess;

20
apitest/src/main/java/bisq/apitest/config/BisqAppConfig.java → apitest/src/main/java/bisq/apitest/config/HavenoAppConfig.java
View file

@ -19,17 +19,17 @@ package bisq.apitest.config;
import bisq.seednode.SeedNodeMain;
import bisq.desktop.app.BisqAppMain;
import bisq.desktop.app.HavenoAppMain;
import bisq.daemon.app.BisqDaemonMain;
import bisq.daemon.app.HavenoDaemonMain;
/**
Some non user configurable Bisq seednode, arb node, bob and alice daemon option values.
@see <a href="https://github.com/bisq-network/bisq/blob/master/docs/dev-setup.md">dev-setup.md</a>
*/
public enum BisqAppConfig {
public enum HavenoAppConfig {
seednode("bisq-XMR_STAGENET_Seed_2002",
"bisq-seednode",
@ -42,7 +42,7 @@ public enum BisqAppConfig {
arbdaemon("bisq-XMR_STAGENET_Arb",
"bisq-daemon",
"-XX:MaxRAM=2g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml",
BisqDaemonMain.class.getName(),
HavenoDaemonMain.class.getName(),
4444,
5121,
9997,
@ -50,7 +50,7 @@ public enum BisqAppConfig {
arbdesktop("bisq-XMR_STAGENET_Arb",
"bisq-desktop",
"-XX:MaxRAM=3g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml",
BisqAppMain.class.getName(),
HavenoAppMain.class.getName(),
4444,
5121,
-1,
@ -58,7 +58,7 @@ public enum BisqAppConfig {
alicedaemon("bisq-XMR_STAGENET_Alice",
"bisq-daemon",
"-XX:MaxRAM=2g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml",
BisqDaemonMain.class.getName(),
HavenoDaemonMain.class.getName(),
7777,
5122,
9998,
@ -66,7 +66,7 @@ public enum BisqAppConfig {
alicedesktop("bisq-XMR_STAGENET_Alice",
"bisq-desktop",
"-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml",
BisqAppMain.class.getName(),
HavenoAppMain.class.getName(),
7777,
5122,
-1,
@ -74,7 +74,7 @@ public enum BisqAppConfig {
bobdaemon("bisq-XMR_STAGENET_Bob",
"bisq-daemon",
"-XX:MaxRAM=2g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml",
BisqDaemonMain.class.getName(),
HavenoDaemonMain.class.getName(),
8888,
5123,
9999,
@ -82,7 +82,7 @@ public enum BisqAppConfig {
bobdesktop("bisq-XMR_STAGENET_Bob",
"bisq-desktop",
"-XX:MaxRAM=4g -Dlogback.configurationFile=apitest/build/resources/main/logback.xml",
BisqAppMain.class.getName(),
HavenoAppMain.class.getName(),
8888,
5123,
-1,
@ -98,7 +98,7 @@ public enum BisqAppConfig {
public final int apiPort;
public final int remoteDebugPort;
BisqAppConfig(String appName,
HavenoAppConfig(String appName,
String startupScript,
String javaOpts,
String mainClassName,

12
apitest/src/main/java/bisq/apitest/linux/BisqProcess.java → apitest/src/main/java/bisq/apitest/linux/HavenoProcess.java
View file

@ -34,16 +34,16 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
import bisq.apitest.config.ApiTestConfig;
import bisq.apitest.config.BisqAppConfig;
import bisq.daemon.app.BisqDaemonMain;
import bisq.apitest.config.HavenoAppConfig;
import bisq.daemon.app.HavenoDaemonMain;
/**
* Runs a regtest/dao Bisq application instance in the background.
*/
@Slf4j
public class BisqProcess extends AbstractLinuxProcess implements LinuxProcess {
public class HavenoProcess extends AbstractLinuxProcess implements LinuxProcess {
private final BisqAppConfig bisqAppConfig;
private final HavenoAppConfig bisqAppConfig;
private final String baseCurrencyNetwork;
private final String genesisTxId;
private final int genesisBlockHeight;
@ -53,7 +53,7 @@ public class BisqProcess extends AbstractLinuxProcess implements LinuxProcess {
private final String findBisqPidScript;
private final String debugOpts;
public BisqProcess(BisqAppConfig bisqAppConfig, ApiTestConfig config) {
public HavenoProcess(HavenoAppConfig bisqAppConfig, ApiTestConfig config) {
super(bisqAppConfig.appName, config);
this.bisqAppConfig = bisqAppConfig;
this.baseCurrencyNetwork = "XMR_STAGENET";
@ -235,7 +235,7 @@ public class BisqProcess extends AbstractLinuxProcess implements LinuxProcess {
case bobdesktop:
add("--genesisBlockHeight=" + genesisBlockHeight);
add("--genesisTxId=" + genesisTxId);
if (bisqAppConfig.mainClassName.equals(BisqDaemonMain.class.getName())) {
if (bisqAppConfig.mainClassName.equals(HavenoDaemonMain.class.getName())) {
add("--apiPassword=" + config.apiPassword);
add("--apiPort=" + bisqAppConfig.apiPort);
}

6
apitest/src/test/java/bisq/apitest/ApiTestCase.java
View file

@ -29,9 +29,9 @@ import javax.annotation.Nullable;
import org.junit.jupiter.api.TestInfo;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.BisqAppConfig.arbdaemon;
import static bisq.apitest.config.BisqAppConfig.bobdaemon;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.arbdaemon;
import static bisq.apitest.config.HavenoAppConfig.bobdaemon;
import static bisq.proto.grpc.DisputeAgentsGrpc.getRegisterDisputeAgentMethod;
import static bisq.proto.grpc.GetVersionGrpc.getGetVersionMethod;
import static java.net.InetAddress.getLoopbackAddress;

2
apitest/src/test/java/bisq/apitest/method/CallRateMeteringInterceptorTest.java
View file

@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

2
apitest/src/test/java/bisq/apitest/method/GetMethodHelpTest.java
View file

@ -26,7 +26,7 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static bisq.cli.Method.createoffer;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;

2
apitest/src/test/java/bisq/apitest/method/GetVersionTest.java
View file

@ -26,7 +26,7 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static bisq.common.app.Version.VERSION;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;

4
apitest/src/test/java/bisq/apitest/method/RegisterDisputeAgentsTest.java
View file

@ -32,8 +32,8 @@ import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.ApiTestConfig.ARBITRATOR;
import static bisq.apitest.config.ApiTestConfig.MEDIATOR;
import static bisq.apitest.config.ApiTestConfig.REFUND_AGENT;
import static bisq.apitest.config.BisqAppConfig.arbdaemon;
import static bisq.apitest.config.BisqAppConfig.seednode;
import static bisq.apitest.config.HavenoAppConfig.arbdaemon;
import static bisq.apitest.config.HavenoAppConfig.seednode;
import static bisq.common.app.DevEnv.DEV_PRIVILEGE_PRIV_KEY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

8
apitest/src/test/java/bisq/apitest/method/offer/AbstractOfferTest.java
View file

@ -32,10 +32,10 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.BisqAppConfig.arbdaemon;
import static bisq.apitest.config.BisqAppConfig.bobdaemon;
import static bisq.apitest.config.BisqAppConfig.seednode;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.arbdaemon;
import static bisq.apitest.config.HavenoAppConfig.bobdaemon;
import static bisq.apitest.config.HavenoAppConfig.seednode;
import static bisq.common.util.MathUtils.roundDouble;
import static bisq.common.util.MathUtils.scaleDownByPowerOf10;
import static bisq.core.locale.CurrencyUtil.isCryptoCurrency;

2
apitest/src/test/java/bisq/apitest/method/payment/CreatePaymentAccountTest.java
View file

@ -70,7 +70,7 @@ import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static bisq.cli.TableFormat.formatPaymentAcctTbl;
import static bisq.core.locale.CurrencyUtil.*;
import static bisq.core.payment.payload.PaymentMethod.*;

2
apitest/src/test/java/bisq/apitest/method/payment/GetPaymentMethodsTest.java
View file

@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

4
apitest/src/test/java/bisq/apitest/method/wallet/BtcTxFeeRateTest.java
View file

@ -15,8 +15,8 @@ import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.BisqAppConfig.seednode;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.seednode;
import static java.lang.String.format;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;

6
apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java
View file

@ -14,9 +14,9 @@ import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.BisqAppConfig.bobdaemon;
import static bisq.apitest.config.BisqAppConfig.seednode;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.bobdaemon;
import static bisq.apitest.config.HavenoAppConfig.seednode;
import static bisq.apitest.method.wallet.WalletTestUtil.INITIAL_BTC_BALANCES;
import static bisq.apitest.method.wallet.WalletTestUtil.verifyBtcBalances;
import static bisq.cli.TableFormat.formatAddressBalanceTbl;

2
apitest/src/test/java/bisq/apitest/method/wallet/WalletProtectionTest.java
View file

@ -11,7 +11,7 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

4
apitest/src/test/java/bisq/apitest/scenario/PaymentAccountTest.java
View file

@ -11,8 +11,8 @@ import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.BisqAppConfig.seednode;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.seednode;
import static org.junit.jupiter.api.Assertions.fail;

8
apitest/src/test/java/bisq/apitest/scenario/ScriptedBotTest.java
View file

@ -29,10 +29,10 @@ import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.condition.EnabledIf;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.BisqAppConfig.arbdaemon;
import static bisq.apitest.config.BisqAppConfig.bobdaemon;
import static bisq.apitest.config.BisqAppConfig.seednode;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.arbdaemon;
import static bisq.apitest.config.HavenoAppConfig.bobdaemon;
import static bisq.apitest.config.HavenoAppConfig.seednode;
import static bisq.apitest.scenario.bot.shutdown.ManualShutdown.startShutdownTimer;
import static org.junit.jupiter.api.Assertions.fail;

6
apitest/src/test/java/bisq/apitest/scenario/StartupTest.java
View file

@ -30,9 +30,9 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.BisqAppConfig.arbdaemon;
import static bisq.apitest.config.BisqAppConfig.seednode;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.arbdaemon;
import static bisq.apitest.config.HavenoAppConfig.seednode;
import static bisq.common.file.FileUtil.deleteFileIfExists;
import static org.junit.jupiter.api.Assertions.fail;

8
apitest/src/test/java/bisq/apitest/scenario/WalletTest.java
View file

@ -28,10 +28,10 @@ import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestMethodOrder;
import static bisq.apitest.Scaffold.BitcoinCoreApp.bitcoind;
import static bisq.apitest.config.BisqAppConfig.alicedaemon;
import static bisq.apitest.config.BisqAppConfig.arbdaemon;
import static bisq.apitest.config.BisqAppConfig.bobdaemon;
import static bisq.apitest.config.BisqAppConfig.seednode;
import static bisq.apitest.config.HavenoAppConfig.alicedaemon;
import static bisq.apitest.config.HavenoAppConfig.arbdaemon;
import static bisq.apitest.config.HavenoAppConfig.bobdaemon;
import static bisq.apitest.config.HavenoAppConfig.seednode;

4
apitest/src/test/java/bisq/apitest/scenario/bot/InvalidRandomOfferException.java
View file

@ -17,10 +17,10 @@
package bisq.apitest.scenario.bot;
import bisq.common.BisqException;
import bisq.common.HavenoException;
@SuppressWarnings("unused")
public class InvalidRandomOfferException extends BisqException {
public class InvalidRandomOfferException extends HavenoException {
public InvalidRandomOfferException(Throwable cause) {
super(cause);
}

4
apitest/src/test/java/bisq/apitest/scenario/bot/PaymentAccountNotFoundException.java
View file

@ -17,10 +17,10 @@
package bisq.apitest.scenario.bot;
import bisq.common.BisqException;
import bisq.common.HavenoException;
@SuppressWarnings("unused")
public class PaymentAccountNotFoundException extends BisqException {
public class PaymentAccountNotFoundException extends HavenoException {
public PaymentAccountNotFoundException(Throwable cause) {
super(cause);
}

4
apitest/src/test/java/bisq/apitest/scenario/bot/shutdown/ManualBotShutdownException.java
View file

@ -17,10 +17,10 @@
package bisq.apitest.scenario.bot.shutdown;
import bisq.common.BisqException;
import bisq.common.HavenoException;
@SuppressWarnings("unused")
public class ManualBotShutdownException extends BisqException {
public class ManualBotShutdownException extends HavenoException {
public ManualBotShutdownException(Throwable cause) {
super(cause);
}