Commit aa773c41 authored by Dan Gershony's avatar Dan Gershony Committed by GitHub

Merge pull request #200 from nopara73/remove-common

Update submodule, remove common
parents efcdc7a5 29d8a423
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio 15
VisualStudioVersion = 15.0.26430.16 VisualStudioVersion = 15.0.26730.10
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{807563C4-7259-434D-B604-A14C3DCF8E30}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{807563C4-7259-434D-B604-A14C3DCF8E30}"
EndProject EndProject
...@@ -18,8 +18,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Breeze.Daemon", "src\Breeze ...@@ -18,8 +18,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Breeze.Daemon", "src\Breeze
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin", "..\StratisBitcoinFullNode\Stratis.Bitcoin\Stratis.Bitcoin.csproj", "{C93CB29F-C0A1-40D6-A4CC-B93C75423ED5}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin", "..\StratisBitcoinFullNode\Stratis.Bitcoin\Stratis.Bitcoin.csproj", "{C93CB29F-C0A1-40D6-A4CC-B93C75423ED5}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin.Common", "..\StratisBitcoinFullNode\Stratis.Bitcoin.Common\Stratis.Bitcoin.Common.csproj", "{330D169F-1C9A-41B4-834B-AE363FF85811}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBitcoin", "..\StratisBitcoinFullNode\NStratis\NBitcoin\NBitcoin.csproj", "{05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBitcoin", "..\StratisBitcoinFullNode\NStratis\NBitcoin\NBitcoin.csproj", "{05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HashLib", "..\StratisBitcoinFullNode\NStratis\Hashing\HashLib\HashLib.csproj", "{25A26C47-210F-4B7F-A48C-71760D0C9475}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HashLib", "..\StratisBitcoinFullNode\NStratis\Hashing\HashLib\HashLib.csproj", "{25A26C47-210F-4B7F-A48C-71760D0C9475}"
...@@ -42,10 +40,6 @@ Global ...@@ -42,10 +40,6 @@ Global
{C93CB29F-C0A1-40D6-A4CC-B93C75423ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU {C93CB29F-C0A1-40D6-A4CC-B93C75423ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C93CB29F-C0A1-40D6-A4CC-B93C75423ED5}.Release|Any CPU.ActiveCfg = Release|Any CPU {C93CB29F-C0A1-40D6-A4CC-B93C75423ED5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C93CB29F-C0A1-40D6-A4CC-B93C75423ED5}.Release|Any CPU.Build.0 = Release|Any CPU {C93CB29F-C0A1-40D6-A4CC-B93C75423ED5}.Release|Any CPU.Build.0 = Release|Any CPU
{330D169F-1C9A-41B4-834B-AE363FF85811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{330D169F-1C9A-41B4-834B-AE363FF85811}.Debug|Any CPU.Build.0 = Debug|Any CPU
{330D169F-1C9A-41B4-834B-AE363FF85811}.Release|Any CPU.ActiveCfg = Release|Any CPU
{330D169F-1C9A-41B4-834B-AE363FF85811}.Release|Any CPU.Build.0 = Release|Any CPU
{05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU {05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}.Release|Any CPU.ActiveCfg = Release|Any CPU {05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
...@@ -68,10 +62,12 @@ Global ...@@ -68,10 +62,12 @@ Global
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{C93CB29F-C0A1-40D6-A4CC-B93C75423ED5} = {807563C4-7259-434D-B604-A14C3DCF8E30} {C93CB29F-C0A1-40D6-A4CC-B93C75423ED5} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{330D169F-1C9A-41B4-834B-AE363FF85811} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB} = {807563C4-7259-434D-B604-A14C3DCF8E30} {05787CEF-6A8F-4FF5-A57C-C8A5D4F6C2DB} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{25A26C47-210F-4B7F-A48C-71760D0C9475} = {807563C4-7259-434D-B604-A14C3DCF8E30} {25A26C47-210F-4B7F-A48C-71760D0C9475} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{D541577E-2AB1-4379-BA6D-2F23F0B1DFBB} = {807563C4-7259-434D-B604-A14C3DCF8E30} {D541577E-2AB1-4379-BA6D-2F23F0B1DFBB} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{64EF5766-40C7-46D4-87AA-ED16D0F867B1} = {807563C4-7259-434D-B604-A14C3DCF8E30} {64EF5766-40C7-46D4-87AA-ED16D0F867B1} = {807563C4-7259-434D-B604-A14C3DCF8E30}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {45E7631F-9783-47C2-AB68-4E3B77E250B0}
EndGlobalSection
EndGlobal EndGlobal
...@@ -9,7 +9,6 @@ using Stratis.Bitcoin.Features.BlockStore; ...@@ -9,7 +9,6 @@ using Stratis.Bitcoin.Features.BlockStore;
using Stratis.Bitcoin.Features.Consensus; using Stratis.Bitcoin.Features.Consensus;
using Stratis.Bitcoin.Features.LightWallet; using Stratis.Bitcoin.Features.LightWallet;
using Stratis.Bitcoin.Features.MemoryPool; using Stratis.Bitcoin.Features.MemoryPool;
using Stratis.Bitcoin.Features.Miner;
using Stratis.Bitcoin.Features.Notifications; using Stratis.Bitcoin.Features.Notifications;
using Stratis.Bitcoin.Features.Wallet; using Stratis.Bitcoin.Features.Wallet;
using Stratis.Bitcoin.Utilities; using Stratis.Bitcoin.Utilities;
...@@ -56,7 +55,6 @@ namespace Breeze.Daemon ...@@ -56,7 +55,6 @@ namespace Breeze.Daemon
.UseBlockStore() .UseBlockStore()
.UseMempool() .UseMempool()
.UseWallet() .UseWallet()
.AddPowPosMining()
.UseApi(); .UseApi();
} }
} }
......
Subproject commit 925d3734af929c8cefcc7df52c4a604f40e89caa Subproject commit cb912727c60696bb95311561ae95dc31dac8fdf0
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