Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

3.0.0-CI00044 #357

Merged
merged 9 commits into from
May 22, 2019
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions neo-cli/Settings.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Microsoft.Extensions.Configuration;
using Neo.Network.P2P;
using Neo.SmartContract.Native;
using System.Net;

namespace Neo
Expand Down Expand Up @@ -37,8 +38,8 @@ internal class PathsSettings

public PathsSettings(IConfigurationSection section)
{
this.Chain = string.Format(section.GetSection("Chain").Value, Message.Magic.ToString("X8"));
this.Index = string.Format(section.GetSection("Index").Value, Message.Magic.ToString("X8"));
this.Chain = string.Format(section.GetSection("Chain").Value, ProtocolSettings.Default.Magic.ToString("X8"));
this.Index = string.Format(section.GetSection("Index").Value, ProtocolSettings.Default.Magic.ToString("X8"));
}
}

Expand Down Expand Up @@ -66,15 +67,15 @@ internal class RPCSettings
public ushort Port { get; }
public string SslCert { get; }
public string SslCertPassword { get; }
public Fixed8 MaxGasInvoke { get; }
public long MaxGasInvoke { get; }

public RPCSettings(IConfigurationSection section)
{
this.BindAddress = IPAddress.Parse(section.GetSection("BindAddress").Value);
this.Port = ushort.Parse(section.GetSection("Port").Value);
this.SslCert = section.GetSection("SslCert").Value;
this.SslCertPassword = section.GetSection("SslCertPassword").Value;
this.MaxGasInvoke = Fixed8.Parse(section.GetValue("MaxGasInvoke", "0"));
this.MaxGasInvoke = (long)BigDecimal.Parse(section.GetValue("MaxGasInvoke", "0"), NativeContract.GAS.Decimals).Value;
}
}

Expand Down
194 changes: 0 additions & 194 deletions neo-cli/Shell/Coins.cs

This file was deleted.

Loading