Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-04-30 06:47:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

based on isTestNet, add separete testnet app name and config directory

Browse Source
This commit is contained in:
Jürg Schulthess 2024-09-23 20:06:00 +02:00
parent f6607e0f7e
commit 8b5655a120
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/qortal/network/RNSCommon.java
View File

@ -5,12 +5,14 @@ public class RNSCommon {
/** /**
* Destination application name * Destination application name
*/ */
public static String APP_NAME = "qortal"; public static String MAINNET_APP_NAME = "qortal"; // production
public static String TESTNET_APP_NAME = "qortaltest"; // test net
/** /**
* Configuration path relative to the Qortal launch directory * Configuration path relative to the Qortal launch directory
*/ */
public static String defaultRNSConfigPath = ".reticulum"; public static String defaultRNSConfigPath = ".reticulum";
public static String defaultRNSConfigPathTestnet = ".reticulum_test";
///** ///**
// * Qortal RNS Destinations // * Qortal RNS Destinations

21
src/main/java/org/qortal/network/RNSNetwork.java
View File

@ -33,7 +33,7 @@ import lombok.Data;
import lombok.Synchronized; import lombok.Synchronized;
import org.qortal.repository.DataException; import org.qortal.repository.DataException;
//import org.qortal.settings.Settings; import org.qortal.settings.Settings;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -71,14 +71,15 @@ public class RNSNetwork {
Reticulum reticulum; Reticulum reticulum;
//private static final String APP_NAME = "qortal"; //private static final String APP_NAME = "qortal";
static final String APP_NAME = RNSCommon.APP_NAME; static final String APP_NAME = Settings.getInstance().isTestNet() ? RNSCommon.TESTNET_APP_NAME: RNSCommon.MAINNET_APP_NAME;
static final String defaultConfigPath = ".reticulum"; // if empty will look in Reticulums default paths //static final String defaultConfigPath = ".reticulum"; // if empty will look in Reticulums default paths
static final String defaultConfigPath = Settings.getInstance().isTestNet() ? RNSCommon.defaultRNSConfigPathTestnet: RNSCommon.defaultRNSConfigPath;
//static final String defaultConfigPath = RNSCommon.defaultRNSConfigPath; //static final String defaultConfigPath = RNSCommon.defaultRNSConfigPath;
//private final String defaultConfigPath = Settings.getInstance().getDefaultRNSConfigPathForReticulum(); //private final String defaultConfigPath = Settings.getInstance().getReticulumDefaultConfigPath();
private static Integer MAX_PEERS = 12; private static Integer MAX_PEERS = 12;
//private final Integer MAX_PEERS = Settings.getInstance().getMaxReticulumPeers(); //private final Integer MAX_PEERS = Settings.getInstance().getReticulumMaxPeers();
private static Integer MIN_DESIRED_PEERS = 3; private static Integer MIN_DESIRED_PEERS = 3;
//private final Integer MIN_DESIRED_PEERS = Settings.getInstance().getMinDesiredPeers(); //private final Integer MIN_DESIRED_PEERS = Settings.getInstance().getReticulumMinDesiredPeers();
Identity serverIdentity; Identity serverIdentity;
public Destination baseDestination; public Destination baseDestination;
private volatile boolean isShuttingDown = false; private volatile boolean isShuttingDown = false;
@ -155,13 +156,12 @@ public class RNSNetwork {
APP_NAME, APP_NAME,
"core" "core"
); );
//// idea for other entry point //// idea for other entry point (needs AnnounceHandler with appropriate aspect)
//dataDestination = new Destination( //dataDestination = new Destination(
// serverIdentity, // serverIdentity,
// Direction.IN, // Direction.IN,
// DestinationType.SINGLE, // DestinationType.SINGLE,
// APP_NAME, // APP_NAME,
// "core",
// "qdn" // "qdn"
//); //);
log.info("Destination {} {} running", Hex.encodeHexString(baseDestination.getHash()), baseDestination.getName()); log.info("Destination {} {} running", Hex.encodeHexString(baseDestination.getHash()), baseDestination.getName());
@ -322,12 +322,13 @@ public class RNSNetwork {
// getBaseDestination().announce(); // getBaseDestination().announce();
//} //}
//@Slf4j
private class QAnnounceHandler implements AnnounceHandler { private class QAnnounceHandler implements AnnounceHandler {
@Override @Override
public String getAspectFilter() { public String getAspectFilter() {
// handle all announces // handle all announces
return null; //return null;
// handle cortal.core announces
return "qortal.core";
} }
@Override @Override

9
src/main/java/org/qortal/network/RNSPeer.java
View File

@ -31,6 +31,8 @@ import static io.reticulum.link.LinkStatus.ACTIVE;
import static io.reticulum.identity.IdentityKnownDestination.recall; import static io.reticulum.identity.IdentityKnownDestination.recall;
//import static io.reticulum.identity.IdentityKnownDestination.recallAppData; //import static io.reticulum.identity.IdentityKnownDestination.recallAppData;
import org.qortal.settings.Settings;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.binary.Hex;
@ -45,8 +47,7 @@ import lombok.AccessLevel;
@Slf4j @Slf4j
public class RNSPeer { public class RNSPeer {
//static final String APP_NAME = "qortal"; static final String APP_NAME = Settings.getInstance().isTestNet() ? RNSCommon.TESTNET_APP_NAME: RNSCommon.MAINNET_APP_NAME;
//static final String APP_NAME = RNSCommon.APP_NAME;
//static final String defaultConfigPath = new String(".reticulum"); //static final String defaultConfigPath = new String(".reticulum");
//static final String defaultConfigPath = RNSCommon.defaultRNSConfigPath; //static final String defaultConfigPath = RNSCommon.defaultRNSConfigPath;
@ -75,7 +76,7 @@ public class RNSPeer {
this.serverIdentity, this.serverIdentity,
Direction.OUT, Direction.OUT,
DestinationType.SINGLE, DestinationType.SINGLE,
RNSNetwork.APP_NAME, APP_NAME,
"core" "core"
); );
peerDestination.setProofStrategy(ProofStrategy.PROVE_ALL); peerDestination.setProofStrategy(ProofStrategy.PROVE_ALL);
@ -221,7 +222,7 @@ public class RNSPeer {
public void linkResourceTransferStarted(Resource resource) { public void linkResourceTransferStarted(Resource resource) {
log.debug("Resource transfer started"); log.debug("Resource transfer started");
} }
public void linkResourceTransferComcluded(Resource resource) { public void linkResourceTransferConcluded(Resource resource) {
log.debug("Resource transfer complete"); log.debug("Resource transfer complete");
} }