Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate SignalR feature into WebHost #121

Merged
merged 15 commits into from
May 14, 2020
Merged

Migrate SignalR feature into WebHost #121

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0ba0753
Migrate SignalR feature into WebHost
sondreb May 12, 2020
fb8315b
Improve the Web Socket event handling
sondreb May 13, 2020
5e84889
created a class to handle swagger api documentation xml file inclusion.
MithrilMan May 13, 2020
c15f86c
Fix issue with exceptions during type loading
sondreb May 13, 2020
ebd6cb9
Rename WebHost to NodeHost
sondreb May 13, 2020
2111993
Rename WebHost folder to NodeHost
sondreb May 13, 2020
e0eefad
Removing the dependency on a static service provider
dangershony May 14, 2020
4f8af1b
Remove the Hash and Height
sondreb May 14, 2020
b1794b4
Revert "Remove the Hash and Height"
sondreb May 14, 2020
e9643a0
Merge branch 'feature/migrate-signalr-to-webhost' of https://github.c…
sondreb May 14, 2020
f1bff6f
Move the resolving of HubContext so it only runs when WS is enabled
sondreb May 14, 2020
9aa82ca
Remove hardcoded URL to JS and WS endpoints
sondreb May 14, 2020
ac76f1b
Handle serialization of IPAddress, add ignore on structures that cras…
sondreb May 14, 2020
12b1983
Fix dependency issue for broadcasters when no IEventsSubscriptionServ…
sondreb May 14, 2020
1306285
Update InitialBlockDownloadState.cs
sondreb May 14, 2020
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
7 changes: 0 additions & 7 deletions src/Blockcore.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.ColdStak
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.ColdStaking.Tests", "Tests\Blockcore.Features.ColdStaking.Tests\Blockcore.Features.ColdStaking.Tests.csproj", "{0FE19EFE-98D7-4243-A8CC-30BCFFFC4499}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.SignalR", "Features\Blockcore.Features.SignalR\Blockcore.Features.SignalR.csproj", "{6BBFFE59-0597-4ADA-A592-CED25C05C01A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blockcore.Features.Diagnostic", "Features\Blockcore.Features.Diagnostic\Blockcore.Features.Diagnostic.csproj", "{53209209-7239-4FEB-BE8D-B2DF6145BBDA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StratisD", "Networks\Stratis\Stratisd\StratisD.csproj", "{B69D6038-8731-4DF3-9D93-3045C77CBDE6}"
Expand Down Expand Up @@ -235,10 +233,6 @@ Global
{0FE19EFE-98D7-4243-A8CC-30BCFFFC4499}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0FE19EFE-98D7-4243-A8CC-30BCFFFC4499}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0FE19EFE-98D7-4243-A8CC-30BCFFFC4499}.Release|Any CPU.Build.0 = Release|Any CPU
{6BBFFE59-0597-4ADA-A592-CED25C05C01A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6BBFFE59-0597-4ADA-A592-CED25C05C01A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6BBFFE59-0597-4ADA-A592-CED25C05C01A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6BBFFE59-0597-4ADA-A592-CED25C05C01A}.Release|Any CPU.Build.0 = Release|Any CPU
{53209209-7239-4FEB-BE8D-B2DF6145BBDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53209209-7239-4FEB-BE8D-B2DF6145BBDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53209209-7239-4FEB-BE8D-B2DF6145BBDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -334,7 +328,6 @@ Global
{A8EDFB26-17B5-48C0-BF38-E521EF5476E4} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
{072C5F7C-4B75-46C9-A54D-774DA77ED1D1} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
{0FE19EFE-98D7-4243-A8CC-30BCFFFC4499} = {EAE139C2-B19C-4905-9117-8A4068ABD3D2}
{6BBFFE59-0597-4ADA-A592-CED25C05C01A} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
{53209209-7239-4FEB-BE8D-B2DF6145BBDA} = {15D29FFD-6142-4DC5-AFFD-10BA0CA55C45}
{B69D6038-8731-4DF3-9D93-3045C77CBDE6} = {0F6F0DC5-EC62-465B-8FC7-F24449CD7359}
{221FF9A3-4BE5-44CB-91C8-885EFE06CB2E} = {78DF115B-2471-41C3-8D9C-360720855CF5}
Expand Down
7 changes: 0 additions & 7 deletions src/Blockcore/Configuration/NodeSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@ public class NodeSettings : IDisposable
/// </summary>
public FeeRate MinRelayTxFeeRate { get; private set; }

/// <summary>
/// If true then the node will add and start the SignalR feature.
/// </summary>
public bool EnableSignalR { get; private set; }

/// <summary>
/// Initializes a new instance of the object.
/// </summary>
Expand Down Expand Up @@ -233,8 +228,6 @@ public NodeSettings(Network network = null, ProtocolVersion protocolVersion = Su
this.ReadConfigurationFile();
}

this.EnableSignalR = this.ConfigReader.GetOrDefault<bool>("enableSignalR", false, this.Logger);

// Create the custom logger factory.
this.LoggerFactory.AddFilters(this.Log, this.DataFolder);

Expand Down
1 change: 1 addition & 0 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<PackageIcon></PackageIcon>
<PackageIconUrl>https://www.blockcore.net/assets/blockcore-256x256.png</PackageIconUrl>
<PackageTags>blockchain;cryptocurrency;crypto;C#;.NET;bitcoin;blockcore</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<Target Name="AddInternalsVisibleTo" BeforeTargets="CoreCompile">
Expand Down
1 change: 1 addition & 0 deletions src/External/NBitcoin/Network.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ public abstract class Network
/// <summary>
/// The default port on which SignalR broadcasts for this network.
/// </summary>
[Obsolete("SignalR has been migrated into WebHost and use same port as API.")]
sondreb marked this conversation as resolved.
Show resolved Hide resolved
public int DefaultSignalRPort { get; protected set; }

/// <summary>
Expand Down
4 changes: 0 additions & 4 deletions src/Features/Blockcore.Features.ColdStaking/Blockcore.Features.ColdStaking.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile></DocumentationFile>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Blockcore\Blockcore.csproj" />
<ProjectReference Include="..\..\External\NBitcoin\NBitcoin.csproj" />
Expand Down
18 changes: 0 additions & 18 deletions src/Features/Blockcore.Features.SignalR/Blockcore.Features.SignalR.csproj
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions src/Features/Blockcore.Features.SignalR/Controllers/SignalRController.cs
View file
Open in desktop

This file was deleted.

60 changes: 0 additions & 60 deletions src/Features/Blockcore.Features.SignalR/Program.cs
View file
Open in desktop

This file was deleted.

147 changes: 0 additions & 147 deletions src/Features/Blockcore.Features.SignalR/SignalRFeature.cs
View file
Open in desktop

This file was deleted.

Loading