Refactor City network definition into Blockcore namespace

sondreb · sondreb · commit 6cb50b5f203c · 2020-12-23T02:48:18.000+01:00
diff --git a/src/Networks/Blockcore.Networks.City/CitySetup.cs b/src/Networks/Blockcore.Networks.City/CitySetup.cs
@@ -1,16 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Runtime.Versioning;
 using Blockcore.Consensus.Checkpoints;
-using City.Networks;
-using City.Networks.Setup;
+using Blockcore.Networks.City.Networks.Setup;
 using NBitcoin;
 
-namespace City
+namespace Blockcore.Networks.City
 {
-   internal class CitySetup
+    internal class CitySetup
    {
       internal static CitySetup Instance = new CitySetup();
 
diff --git a/src/Networks/Blockcore.Networks.City/Networks/CityMain.cs b/src/Networks/Blockcore.Networks.City/Networks/CityMain.cs
@@ -1,31 +1,28 @@
 using System;
 using System.Collections.Generic;
-using Blockcore.Features.Consensus.Rules.CommonRules;
-using Blockcore.Features.Consensus.Rules.ProvenHeaderRules;
-using Blockcore.Features.Consensus.Rules.UtxosetRules;
-using Blockcore.Features.MemoryPool.Rules;
-using City.Networks.Policies;
-using City.Networks.Rules;
-using NBitcoin;
-using NBitcoin.BouncyCastle.Math;
-using NBitcoin.DataEncoders;
-using System.Collections;
 using System.Linq;
-using System.Collections.Specialized;
 using System.Net;
 using Blockcore.Base.Deployments;
 using Blockcore.Consensus;
 using Blockcore.Consensus.BlockInfo;
 using Blockcore.Consensus.ScriptInfo;
 using Blockcore.Consensus.TransactionInfo;
-using Blockcore.Networks;
+using Blockcore.Features.Consensus.Rules.CommonRules;
+using Blockcore.Features.Consensus.Rules.ProvenHeaderRules;
+using Blockcore.Features.Consensus.Rules.UtxosetRules;
+using Blockcore.Features.MemoryPool.Rules;
+using Blockcore.Networks.City.Networks.Consensus;
+using Blockcore.Networks.City.Networks.Deployments;
+using Blockcore.Networks.City.Networks.Policies;
+using Blockcore.Networks.City.Networks.Rules;
+using Blockcore.Networks.City.Networks.Setup;
 using Blockcore.P2P;
-using City.Networks.Consensus;
-using City.Networks.Setup;
+using NBitcoin;
+using NBitcoin.BouncyCastle.Math;
+using NBitcoin.DataEncoders;
 using NBitcoin.Protocol;
-using City.Networks.Deployments;
 
-namespace City.Networks
+namespace Blockcore.Networks.City.Networks
 {
     public class CityMain : Network
     {
diff --git a/src/Networks/Blockcore.Networks.City/Networks/CityRegTest.cs b/src/Networks/Blockcore.Networks.City/Networks/CityRegTest.cs
@@ -4,18 +4,17 @@
 using Blockcore.Base.Deployments;
 using Blockcore.Consensus;
 using Blockcore.Consensus.BlockInfo;
-using Blockcore.Networks;
+using Blockcore.Networks.City.Networks.Consensus;
+using Blockcore.Networks.City.Networks.Deployments;
+using Blockcore.Networks.City.Networks.Policies;
+using Blockcore.Networks.City.Networks.Setup;
 using Blockcore.P2P;
-using City.Networks.Consensus;
-using City.Networks.Deployments;
-using City.Networks.Policies;
-using City.Networks.Setup;
 using NBitcoin;
 using NBitcoin.BouncyCastle.Math;
 using NBitcoin.DataEncoders;
 using NBitcoin.Protocol;
 
-namespace City.Networks
+namespace Blockcore.Networks.City.Networks
 {
     public class CityRegTest : CityMain
     {
diff --git a/src/Networks/Blockcore.Networks.City/Networks/CityTest.cs b/src/Networks/Blockcore.Networks.City/Networks/CityTest.cs
@@ -4,18 +4,17 @@
 using Blockcore.Base.Deployments;
 using Blockcore.Consensus;
 using Blockcore.Consensus.BlockInfo;
-using Blockcore.Networks;
+using Blockcore.Networks.City.Networks.Consensus;
+using Blockcore.Networks.City.Networks.Deployments;
+using Blockcore.Networks.City.Networks.Policies;
+using Blockcore.Networks.City.Networks.Setup;
 using Blockcore.P2P;
-using City.Networks.Consensus;
-using City.Networks.Deployments;
-using City.Networks.Policies;
-using City.Networks.Setup;
 using NBitcoin;
 using NBitcoin.BouncyCastle.Math;
 using NBitcoin.DataEncoders;
 using NBitcoin.Protocol;
 
-namespace City.Networks
+namespace Blockcore.Networks.City.Networks
 {
     public class CityTest : CityMain
     {
diff --git a/src/Networks/Blockcore.Networks.City/Networks/Consensus/CityPosConsensusOptions.cs b/src/Networks/Blockcore.Networks.City/Networks/Consensus/CityPosConsensusOptions.cs
@@ -5,7 +5,7 @@
 using Blockcore.Networks;
 using NBitcoin;
 
-namespace City.Networks.Consensus
+namespace Blockcore.Networks.City.Networks.Consensus
 {
     public class CityPosConsensusOptions : PosConsensusOptions
     {
diff --git a/src/Networks/Blockcore.Networks.City/Networks/Deployments/CityBIP9Deployments.cs b/src/Networks/Blockcore.Networks.City/Networks/Deployments/CityBIP9Deployments.cs
@@ -2,7 +2,7 @@
 using Blockcore.Consensus.ScriptInfo;
 using NBitcoin;
 
-namespace City.Networks.Deployments
+namespace Blockcore.Networks.City.Networks.Deployments
 {
     /// <summary>
     /// BIP9 deployments for the Blockcore sample coin network.
diff --git a/src/Networks/Blockcore.Networks.City/Networks/Networks.cs b/src/Networks/Blockcore.Networks.City/Networks/Networks.cs
@@ -1,7 +1,7 @@
 using Blockcore.Networks;
 using NBitcoin;
 
-namespace City.Networks
+namespace Blockcore.Networks.City.Networks
 {
    public static class Networks
    {
diff --git a/src/Networks/Blockcore.Networks.City/Networks/Policies/CityStandardScriptsRegistry.cs b/src/Networks/Blockcore.Networks.City/Networks/Policies/CityStandardScriptsRegistry.cs
@@ -6,7 +6,7 @@
 using NBitcoin;
 using NBitcoin.BitcoinCore;
 
-namespace City.Networks.Policies
+namespace Blockcore.Networks.City.Networks.Policies
 {
    /// <summary>
    /// Blockcore sample coin-specific standard transaction definitions.
diff --git a/src/Networks/Blockcore.Networks.City/Networks/Rules/CityCheckPosUtxosetRule.cs b/src/Networks/Blockcore.Networks.City/Networks/Rules/CityCheckPosUtxosetRule.cs
@@ -1,7 +1,7 @@
 ﻿using Blockcore.Features.Consensus.Rules.UtxosetRules;
 using NBitcoin;
 
-namespace City.Networks.Rules
+namespace Blockcore.Networks.City.Networks.Rules
 {
     /// <summary>
     /// Proof of stake override for the coinview rules - BIP68, MaxSigOps and BlockReward checks.
diff --git a/src/Networks/Blockcore.Networks.City/Networks/Rules/CityHeaderVersionRule.cs b/src/Networks/Blockcore.Networks.City/Networks/Rules/CityHeaderVersionRule.cs
@@ -6,7 +6,7 @@
 using Microsoft.Extensions.Logging;
 using NBitcoin;
 
-namespace City.Networks.Rules
+namespace Blockcore.Networks.City.Networks.Rules
 {
    /// <summary>
    /// Checks if <see cref="CityMain"/> network block's header has a valid block version.
diff --git a/src/Networks/Blockcore.Networks.City/Networks/Setup/CoinSetup.cs b/src/Networks/Blockcore.Networks.City/Networks/Setup/CoinSetup.cs
@@ -3,7 +3,7 @@
 using Blockcore.Consensus.Checkpoints;
 using NBitcoin;
 
-namespace City.Networks.Setup
+namespace Blockcore.Networks.City.Networks.Setup
 {
    internal class CoinSetup
    {
diff --git a/src/Networks/Blockcore.Networks.City/Networks/Setup/ConversionTools.cs b/src/Networks/Blockcore.Networks.City/Networks/Setup/ConversionTools.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace City.Networks.Setup
+namespace Blockcore.Networks.City.Networks.Setup
 {
    public class ConversionTools
    {
diff --git a/src/Node/Blockcore.Node/NetworkSelector.cs b/src/Node/Blockcore.Node/NetworkSelector.cs
@@ -18,7 +18,7 @@ public static NodeSettings Create(string chain, string[] args)
                     break;
 
                 case "CITY":
-                    nodeSettings = new NodeSettings(networksSelector: City.Networks.Networks.City, args: args);
+                    nodeSettings = new NodeSettings(networksSelector: Blockcore.Networks.City.Networks.Networks.City, args: args);
                     break;
 
                 case "STRAT":

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using Blockcore.Networks;`
`6`	`6`	`using NBitcoin;`
`7`	`7`
`8`		`-namespace City.Networks.Consensus`
	`8`	`+namespace Blockcore.Networks.City.Networks.Consensus`
`9`	`9`	`{`
`10`	`10`	`public class CityPosConsensusOptions : PosConsensusOptions`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using Blockcore.Consensus.ScriptInfo;`
`3`	`3`	`using NBitcoin;`
`4`	`4`
`5`		`-namespace City.Networks.Deployments`
	`5`	`+namespace Blockcore.Networks.City.Networks.Deployments`
`6`	`6`	`{`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// BIP9 deployments for the Blockcore sample coin network.`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using Blockcore.Networks;`
`2`	`2`	`using NBitcoin;`
`3`	`3`
`4`		`-namespace City.Networks`
	`4`	`+namespace Blockcore.Networks.City.Networks`
`5`	`5`	`{`
`6`	`6`	`public static class Networks`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using NBitcoin;`
`7`	`7`	`using NBitcoin.BitcoinCore;`
`8`	`8`
`9`		`-namespace City.Networks.Policies`
	`9`	`+namespace Blockcore.Networks.City.Networks.Policies`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Blockcore sample coin-specific standard transaction definitions.`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using Blockcore.Features.Consensus.Rules.UtxosetRules;`
`2`	`2`	`using NBitcoin;`
`3`	`3`
`4`		`-namespace City.Networks.Rules`
	`4`	`+namespace Blockcore.Networks.City.Networks.Rules`
`5`	`5`	`{`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Proof of stake override for the coinview rules - BIP68, MaxSigOps and BlockReward checks.`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using Microsoft.Extensions.Logging;`
`7`	`7`	`using NBitcoin;`
`8`	`8`
`9`		`-namespace City.Networks.Rules`
	`9`	`+namespace Blockcore.Networks.City.Networks.Rules`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Checks if <see cref="CityMain"/> network block's header has a valid block version.`