Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-19 03:38:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Qualify id, ip and port options with 'bootstrap.node.*'

Browse source 
This change clarifies the relationship between the Bitsquare node that
is being run (the local node) and the Bitsquare node that the local node
is being bootstrapped against (the bootstrap node).

Prior to this change, customizing bootstrap node looked like this:

    java -jar bitsquare.jar --ip=203.0.113.3

Now it looks like this:

    java -jar bitsquare.jar --bootstrap.node.ip=203.0.113.3

This change also removes entirely the short option strings (-d, -s, -p,
-i) for simplicity and clarity while these values are undergoing change.

By qualifying bootstrap node options explicitly in this fashion, we make
way for customizing the the same values against the local node. These
changes will come with subsequent commits.
This commit is contained in:
Chris Beams 2014-11-10 11:27:50 +01:00
parent bad88f1612
commit 9ddf075366
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/io/bitsquare/app/ArgumentParser.java
View file

@ -34,15 +34,15 @@ public class ArgumentParser {
.description("Bitsquare - The decentralized bitcoin exchange"); .description("Bitsquare - The decentralized bitcoin exchange");
// Args for seed node config // Args for seed node config
parser.addArgument("-d", "--" + BOOTSTRAP_NODE_ID_KEY) parser.addArgument("--" + BOOTSTRAP_NODE_ID_KEY)
.help("Seed node ID"); .help("Seed node ID");
parser.addArgument("-s", "--" + BOOTSTRAP_NODE_IP_KEY) parser.addArgument("--" + BOOTSTRAP_NODE_IP_KEY)
.help("Seed node IP"); .help("Seed node IP");
parser.addArgument("-p", "--" + BOOTSTRAP_NODE_PORT_KEY) parser.addArgument("--" + BOOTSTRAP_NODE_PORT_KEY)
.help("Seed node port"); .help("Seed node port");
// A custom network interface (needed at the moment for windows, but might be useful also later) // A custom network interface (needed at the moment for windows, but might be useful also later)
parser.addArgument("-i", "--" + NETWORK_INTERFACE_KEY) parser.addArgument("--" + NETWORK_INTERFACE_KEY)
.help("Network interface"); .help("Network interface");
// Args for app config // Args for app config

6
src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
View file

@ -32,9 +32,9 @@ import static io.bitsquare.network.BootstrapNodes.DEFAULT_BOOTSTRAP_NODE;
public class TomP2PMessageModule extends MessageModule { public class TomP2PMessageModule extends MessageModule {
public static final String BOOTSTRAP_NODE_ID_KEY = "id"; public static final String BOOTSTRAP_NODE_ID_KEY = "bootstrap.node.id";
public static final String BOOTSTRAP_NODE_IP_KEY = "ip"; public static final String BOOTSTRAP_NODE_IP_KEY = "bootstrap.node.ip";
public static final String BOOTSTRAP_NODE_PORT_KEY = "port"; public static final String BOOTSTRAP_NODE_PORT_KEY = "bootstrap.node.port";
public static final String NETWORK_INTERFACE_KEY = BootstrappedPeerFactory.NETWORK_INTERFACE_KEY; public static final String NETWORK_INTERFACE_KEY = BootstrappedPeerFactory.NETWORK_INTERFACE_KEY;
public TomP2PMessageModule(Properties properties) { public TomP2PMessageModule(Properties properties) {