Skip to content

Commit

Permalink
Merge pull request #108 from pingpongsneak/master
Browse files Browse the repository at this point in the history
Fix for preview-1
  • Loading branch information
pingpongsneak authored Aug 7, 2022
2 parents 5f7bc07 + 582b131 commit f7ca250
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion core/Controllers/BlockController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public async Task<IActionResult> GetBlockAsync(string hash)
}
catch (Exception ex)
{
_logger.Here().Error(ex, "Unable to get the block height");
_logger.Here().Error(ex, "Unable to get the block");
}

return NotFound();
Expand Down
2 changes: 1 addition & 1 deletion core/core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
<RootNamespace>CypherNetwork</RootNamespace>
<AssemblyVersion>0.0.64.0</AssemblyVersion>
<AssemblyVersion>0.0.65.0</AssemblyVersion>
<Company>CypherNetwork</Company>
<PackageId>core</PackageId>
<AssemblyName>cyphernetworkcore</AssemblyName>
Expand Down
9 changes: 3 additions & 6 deletions node/Configuration/Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@ public Configuration(IUserInterface userInterface)
var configTemplate = File.ReadAllText(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configuration",
"Templates", Program.AppSettingsFile));
var config = configTemplate
.Replace("<HTTP_END_POINT>",
$"http://{networkConfiguration.Configuration.IpAddress}:{networkConfiguration.Configuration.ApiPortPublic.ToString()}")
.Replace("<GOSSIP_LISTENING>",
$"{networkConfiguration.Configuration.IpAddress}:{networkConfiguration.Configuration.ListeningPort.ToString()}")
.Replace("<GOSSIP_ADVERTISE>",
$"{networkConfiguration.Configuration.IpAddress}:{networkConfiguration.Configuration.AdvertisePort.ToString()}")
.Replace("<HTTP_END_POINT>", $"http://{networkConfiguration.Configuration.IpAddress}:{networkConfiguration.Configuration.ApiPortPublic.ToString()}")
.Replace("<GOSSIP_LISTENING>", $"tcp://{networkConfiguration.Configuration.IpAddress}:{networkConfiguration.Configuration.ListeningPort.ToString()}")
.Replace("<GOSSIP_ADVERTISE>", $"tcp://{networkConfiguration.Configuration.IpAddress}:{networkConfiguration.Configuration.AdvertisePort.ToString()}")
.Replace("<NODE_NAME>", networkConfiguration.Configuration.NodeName);
var configFileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, Program.AppSettingsFile);
File.WriteAllText(configFileName, config);
Expand Down
2 changes: 1 addition & 1 deletion node/node.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<ServerGarbageCollection>true</ServerGarbageCollection>
<AssemblyVersion>0.0.64.0</AssemblyVersion>
<AssemblyVersion>0.0.65.0</AssemblyVersion>
<NeutralLanguage>en</NeutralLanguage>
<PackageId>node</PackageId>
</PropertyGroup>
Expand Down

0 comments on commit f7ca250

Please sign in to comment.