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

Adjust to removal of --daoActivated opt

Browse Source
This commit is contained in:
ghubstan 2023-02-13 19:09:54 -03:00
parent f69fb3a959
commit e26955bf60
No known key found for this signature in database
GPG Key ID: 46F220FBD5637C5D
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apitest/src/main/java/bisq/apitest/ApiTestMain.java
View File

@ -48,7 +48,7 @@ import bisq.apitest.config.ApiTestConfig;
* *
* All method, scenario and end-to-end tests are found in the test sources folder. * All method, scenario and end-to-end tests are found in the test sources folder.
* *
* Requires bitcoind v0.19 - v22. * Requires bitcoind v0.19 - v23.
*/ */
@Slf4j @Slf4j
public class ApiTestMain { public class ApiTestMain {

2
apitest/src/main/java/bisq/apitest/linux/AbstractLinuxProcess.java
View File

@ -108,7 +108,7 @@ abstract class AbstractLinuxProcess implements LinuxProcess {
File bitcoindExecutable = Paths.get(config.bitcoinPath, "bitcoind").toFile(); File bitcoindExecutable = Paths.get(config.bitcoinPath, "bitcoind").toFile();
if (!bitcoindExecutable.exists() || !bitcoindExecutable.canExecute()) if (!bitcoindExecutable.exists() || !bitcoindExecutable.canExecute())
throw new IllegalStateException(format("'%s' cannot be found or executed.%n" throw new IllegalStateException(format("'%s' cannot be found or executed.%n"
+ "A bitcoin-core v0.19 - v22 installation is required," + + "A bitcoin-core v0.19 - v23 installation is required," +
" and the 'bitcoinPath' must be configured in 'apitest.properties'", " and the 'bitcoinPath' must be configured in 'apitest.properties'",
bitcoindExecutable.getAbsolutePath())); bitcoindExecutable.getAbsolutePath()));

3
apitest/src/main/java/bisq/apitest/linux/BisqProcess.java
View File

@ -48,7 +48,6 @@ public class BisqProcess extends AbstractLinuxProcess implements LinuxProcess {
private final String genesisTxId; private final String genesisTxId;
private final int genesisBlockHeight; private final int genesisBlockHeight;
private final String seedNodes; private final String seedNodes;
private final boolean daoActivated;
private final boolean fullDaoNode; private final boolean fullDaoNode;
private final boolean useLocalhostForP2P; private final boolean useLocalhostForP2P;
public final boolean useDevPrivilegeKeys; public final boolean useDevPrivilegeKeys;
@ -62,7 +61,6 @@ public class BisqProcess extends AbstractLinuxProcess implements LinuxProcess {
this.genesisTxId = "30af0050040befd8af25068cc697e418e09c2d8ebd8d411d2240591b9ec203cf"; this.genesisTxId = "30af0050040befd8af25068cc697e418e09c2d8ebd8d411d2240591b9ec203cf";
this.genesisBlockHeight = 111; this.genesisBlockHeight = 111;
this.seedNodes = "localhost:2002"; this.seedNodes = "localhost:2002";
this.daoActivated = true;
this.fullDaoNode = true; this.fullDaoNode = true;
this.useLocalhostForP2P = true; this.useLocalhostForP2P = true;
this.useDevPrivilegeKeys = true; this.useDevPrivilegeKeys = true;
@ -224,7 +222,6 @@ public class BisqProcess extends AbstractLinuxProcess implements LinuxProcess {
add("--rpcUser=" + config.bitcoinRpcUser); add("--rpcUser=" + config.bitcoinRpcUser);
add("--rpcPassword=" + config.bitcoinRpcPassword); add("--rpcPassword=" + config.bitcoinRpcPassword);
add("--rpcPort=" + config.bitcoinRpcPort); add("--rpcPort=" + config.bitcoinRpcPort);
add("--daoActivated=" + daoActivated);
add("--fullDaoNode=" + fullDaoNode); add("--fullDaoNode=" + fullDaoNode);
add("--seedNodes=" + seedNodes); add("--seedNodes=" + seedNodes);
add("--baseCurrencyNetwork=" + baseCurrencyNetwork); add("--baseCurrencyNetwork=" + baseCurrencyNetwork);

3
apitest/src/main/java/bisq/apitest/linux/BitcoinDaemon.java
View File

@ -52,6 +52,9 @@ public class BitcoinDaemon extends AbstractLinuxProcess implements LinuxProcess
+ " -daemon" + " -daemon"
+ " -regtest=1" + " -regtest=1"
+ " -server=1" + " -server=1"
// If using bitcoind v0.19 - v22, you must use (uncomment)
// the '-txindex=1' below to generate regtest BSQ.
// + " -txindex=1"
+ " -peerbloomfilters=1" + " -peerbloomfilters=1"
+ " -debug=net" + " -debug=net"
+ " -fallbackfee=0.0002" + " -fallbackfee=0.0002"