Commit 9d48dd0e authored by Alexey's avatar Alexey

NodeSettings changed to put DeStream instead of Stratis in folder paths.

parent 21812674
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"profiles": { "profiles": {
"Stratis.StratisD": { "Stratis.StratisD": {
"commandName": "Project", "commandName": "Project",
"commandLineArgs": "-testnet -addnode 127.0.0.1" "commandLineArgs": "-testnet -debug -loglevel=trace"
}, },
"Stratis.StratisD Test": { "Stratis.StratisD Test": {
"commandName": "Project", "commandName": "Project",
......
...@@ -8,6 +8,7 @@ using Stratis.Bitcoin.Utilities; ...@@ -8,6 +8,7 @@ using Stratis.Bitcoin.Utilities;
using Stratis.Bitcoin.Configuration; using Stratis.Bitcoin.Configuration;
using System.Collections.Generic; using System.Collections.Generic;
using Stratis.Bitcoin.Builder.Feature; using Stratis.Bitcoin.Builder.Feature;
using Stratis.Bitcoin.Utilities.Extensions;
namespace DeStream.Stratis.Bitcoin.Configuration namespace DeStream.Stratis.Bitcoin.Configuration
{ {
...@@ -25,7 +26,7 @@ namespace DeStream.Stratis.Bitcoin.Configuration ...@@ -25,7 +26,7 @@ namespace DeStream.Stratis.Bitcoin.Configuration
public DeStreamNodeSettings(Network innerNetwork = null, ProtocolVersion protocolVersion = SupportedProtocolVersion, public DeStreamNodeSettings(Network innerNetwork = null, ProtocolVersion protocolVersion = SupportedProtocolVersion,
string agent = "DeStream", string[] args = null, bool loadConfiguration = true) string agent = "DeStream", string[] args = null, bool loadConfiguration = true)
: base (innerNetwork, protocolVersion, agent, args, loadConfiguration) : base (innerNetwork, protocolVersion, agent, args, loadConfiguration)
{ {
} }
/// <summary> /// <summary>
...@@ -43,7 +44,7 @@ namespace DeStream.Stratis.Bitcoin.Configuration ...@@ -43,7 +44,7 @@ namespace DeStream.Stratis.Bitcoin.Configuration
var args = this.LoadArgs; var args = this.LoadArgs;
// Setting the data directory. // Setting the data directory.
if (this.DataDir == null) if (this.LoadArgs.GetValueOf("-datadir") == null || this.DataDir == null)
{ {
this.DataDir = this.CreateDefaultDataDirectories(Path.Combine("DeStreamNode", this.Network.RootFolderName), this.Network); this.DataDir = this.CreateDefaultDataDirectories(Path.Combine("DeStreamNode", this.Network.RootFolderName), this.Network);
} }
......
...@@ -37,7 +37,7 @@ namespace NBitcoin ...@@ -37,7 +37,7 @@ namespace NBitcoin
Network network = new Network Network network = new Network
{ {
Name = "DeStreamMain", Name = "DeStreamMain",
RootFolderName = StratisRootFolderName, RootFolderName = DeStreamRootFolderName,
DefaultConfigFilename = StratisDefaultConfigFilename, DefaultConfigFilename = StratisDefaultConfigFilename,
Magic = magic, Magic = magic,
DefaultPort = 0xDE01, // 56833, DefaultPort = 0xDE01, // 56833,
...@@ -158,7 +158,7 @@ namespace NBitcoin ...@@ -158,7 +158,7 @@ namespace NBitcoin
Network network = new Network Network network = new Network
{ {
Name = "DeStreamTest", Name = "DeStreamTest",
RootFolderName = StratisRootFolderName, RootFolderName = DeStreamRootFolderName,
DefaultConfigFilename = StratisDefaultConfigFilename, DefaultConfigFilename = StratisDefaultConfigFilename,
Magic = magic, Magic = magic,
DefaultPort = 0xDE11, //56849, DefaultPort = 0xDE11, //56849,
...@@ -256,7 +256,7 @@ namespace NBitcoin ...@@ -256,7 +256,7 @@ namespace NBitcoin
Network network = new Network Network network = new Network
{ {
Name = "DeStreamRegTest", Name = "DeStreamRegTest",
RootFolderName = StratisRootFolderName, RootFolderName = DeStreamRootFolderName,
DefaultConfigFilename = StratisDefaultConfigFilename, DefaultConfigFilename = StratisDefaultConfigFilename,
Magic = magic, Magic = magic,
DefaultPort = 18444, DefaultPort = 18444,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment