Refactor x42 network definition to have correct namespace

sondreb · sondreb · commit f2f5efc00305 · 2021-01-09T00:18:46.000+01:00
- Move all x42 network definition code to be under "Blokcore.Networks".
- This fixes a minor issue with excessive logging.
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42Consensus.cs b/src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42Consensus.cs
@@ -5,7 +5,7 @@
 using NBitcoin;
 using NBitcoin.BouncyCastle.Math;
 
-namespace x42.Networks.Consensus
+namespace Blockcore.Networks.x42.Networks.Consensus
 {
     public class x42Consensus : IConsensus
     {
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42ConsensusErrors.cs b/src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42ConsensusErrors.cs
@@ -1,6 +1,6 @@
 ﻿using Blockcore.Consensus;
 
-namespace x42.Networks.Consensus
+namespace Blockcore.Networks.x42.Networks.Consensus
 {
     public static class x42ConsensusErrors
     {
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42PosConsensusOptions.cs b/src/Networks/Blockcore.Networks.x42/Networks/Consensus/x42PosConsensusOptions.cs
@@ -1,8 +1,6 @@
 using Blockcore.Consensus;
-using Blockcore.Networks;
-using NBitcoin;
 
-namespace x42.Networks.Consensus
+namespace Blockcore.Networks.x42.Networks.Consensus
 {
     public class x42PosConsensusOptions : PosConsensusOptions
     {
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/Deployments/x42BIP9Deployments.cs b/src/Networks/Blockcore.Networks.x42/Networks/Deployments/x42BIP9Deployments.cs
@@ -1,14 +1,13 @@
 using Blockcore.Base.Deployments;
 using Blockcore.Consensus.ScriptInfo;
 using Blockcore.Consensus.TransactionInfo;
-using NBitcoin;
 
-namespace x42.Networks.Deployments
+namespace Blockcore.Networks.x42.Networks.Deployments
 {
-   /// <summary>
-   /// BIP9 deployments for the Blockcore sample coin network.
-   /// </summary>
-   public class x42BIP9Deployments : BIP9DeploymentsArray
+    /// <summary>
+    /// BIP9 deployments for the Blockcore sample coin network.
+    /// </summary>
+    public class x42BIP9Deployments : BIP9DeploymentsArray
     {
       // The position of each deployment in the deployments array. Note that this is decoupled from the actual position of the flag bit for the deployment in the block version.
       public const int TestDummy = 0;
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/Networks.cs b/src/Networks/Blockcore.Networks.x42/Networks/Networks.cs
@@ -1,9 +1,6 @@
-using Blockcore.Networks;
-using NBitcoin;
-
-namespace x42.Networks
+namespace Blockcore.Networks.x42.Networks
 {
-   public static class Networks
+    public static class Networks
    {
       public static NetworksSelector x42
       {
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/Policies/x42StandardScriptsRegistry.cs b/src/Networks/Blockcore.Networks.x42/Networks/Policies/x42StandardScriptsRegistry.cs
@@ -2,11 +2,9 @@
 using System.Linq;
 using Blockcore.Consensus.ScriptInfo;
 using Blockcore.Consensus.TransactionInfo;
-using Blockcore.Networks;
-using NBitcoin;
 using NBitcoin.BitcoinCore;
 
-namespace x42.Networks.Policies
+namespace Blockcore.Networks.x42.Networks.Policies
 {
     /// <summary>
     /// x42 coin-specific standard transaction definitions.
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/Rules/x42HeaderVersionRule.cs b/src/Networks/Blockcore.Networks.x42/Networks/Rules/x42HeaderVersionRule.cs
@@ -4,9 +4,8 @@
 using Blockcore.Features.Consensus.Rules.CommonRules;
 using Blockcore.Utilities;
 using Microsoft.Extensions.Logging;
-using NBitcoin;
 
-namespace x42.Networks.Rules
+namespace Blockcore.Networks.x42.Networks.Rules
 {
     /// <summary>
     /// Checks if <see cref="x42Main"/> network block's header has a valid block version.
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/Rules/x42OpReturnFeeMempoolRule.cs b/src/Networks/Blockcore.Networks.x42/Networks/Rules/x42OpReturnFeeMempoolRule.cs
@@ -5,11 +5,10 @@
 using Blockcore.Features.MemoryPool;
 using Blockcore.Features.MemoryPool.Interfaces;
 using Blockcore.Features.MemoryPool.Rules;
-using Blockcore.Networks;
 using Microsoft.Extensions.Logging;
 using NBitcoin;
 
-namespace x42.Networks.Consensus.Rules
+namespace Blockcore.Networks.x42.Networks.Consensus.Rules
 {
     /// <summary>
     /// Verify the OP_RETURN fee.
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/Rules/x42PosCoinviewRule.cs b/src/Networks/Blockcore.Networks.x42/Networks/Rules/x42PosCoinviewRule.cs
@@ -1,8 +1,8 @@
 using Blockcore.Features.Consensus.Rules.UtxosetRules;
+using Blockcore.Networks.x42.Networks.Consensus;
 using NBitcoin;
-using x42.Networks.Consensus;
 
-namespace x42.Networks.Rules
+namespace Blockcore.Networks.x42.Networks.Rules
 {
     public sealed class x42PosCoinviewRule : CheckPosUtxosetRule
     {
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/Setup/CoinSetup.cs b/src/Networks/Blockcore.Networks.x42/Networks/Setup/CoinSetup.cs
@@ -3,7 +3,7 @@
 using Blockcore.Consensus.Checkpoints;
 using NBitcoin;
 
-namespace x42.Networks.Setup
+namespace Blockcore.Networks.x42.Networks.Setup
 {
     internal class CoinSetup
     {
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/Setup/ConversionTools.cs b/src/Networks/Blockcore.Networks.x42/Networks/Setup/ConversionTools.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
-namespace x42.Networks.Setup
+namespace Blockcore.Networks.x42.Networks.Setup
 {
-   public class ConversionTools
+    public class ConversionTools
    {
       public static uint ConvertToUInt32(string magicText, bool reverse = false)
       {
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/x42Main.cs b/src/Networks/Blockcore.Networks.x42/Networks/x42Main.cs
@@ -1,30 +1,29 @@
 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 x42.Networks.Policies;
-using x42.Networks.Rules;
-using NBitcoin;
-using NBitcoin.BouncyCastle.Math;
-using NBitcoin.DataEncoders;
 using System.Linq;
 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.x42.Networks.Consensus;
+using Blockcore.Networks.x42.Networks.Consensus.Rules;
+using Blockcore.Networks.x42.Networks.Deployments;
+using Blockcore.Networks.x42.Networks.Policies;
+using Blockcore.Networks.x42.Networks.Rules;
+using Blockcore.Networks.x42.Networks.Setup;
 using Blockcore.P2P;
-using x42.Networks.Consensus;
-using x42.Networks.Setup;
-using x42.Networks.Deployments;
+using NBitcoin;
+using NBitcoin.BouncyCastle.Math;
+using NBitcoin.DataEncoders;
 using NBitcoin.Protocol;
-using x42.Networks.Consensus.Rules;
 
-namespace x42.Networks
+namespace Blockcore.Networks.x42.Networks
 {
     public class x42Main : Network
     {
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/x42RegTest.cs b/src/Networks/Blockcore.Networks.x42/Networks/x42RegTest.cs
@@ -4,17 +4,16 @@
 using Blockcore.Base.Deployments;
 using Blockcore.Consensus;
 using Blockcore.Consensus.BlockInfo;
-using Blockcore.Networks;
+using Blockcore.Networks.x42.Networks.Consensus;
+using Blockcore.Networks.x42.Networks.Policies;
+using Blockcore.Networks.x42.Networks.Setup;
 using Blockcore.P2P;
-using x42.Networks.Consensus;
-using x42.Networks.Policies;
-using x42.Networks.Setup;
 using NBitcoin;
 using NBitcoin.BouncyCastle.Math;
 using NBitcoin.DataEncoders;
 using NBitcoin.Protocol;
 
-namespace x42.Networks
+namespace Blockcore.Networks.x42.Networks
 {
     public class x42RegTest : x42Main
     {
diff --git a/src/Networks/Blockcore.Networks.x42/Networks/x42Test.cs b/src/Networks/Blockcore.Networks.x42/Networks/x42Test.cs
@@ -4,18 +4,17 @@
 using Blockcore.Base.Deployments;
 using Blockcore.Consensus;
 using Blockcore.Consensus.BlockInfo;
-using Blockcore.Networks;
+using Blockcore.Networks.x42.Networks.Consensus;
+using Blockcore.Networks.x42.Networks.Deployments;
+using Blockcore.Networks.x42.Networks.Policies;
+using Blockcore.Networks.x42.Networks.Setup;
 using Blockcore.P2P;
-using x42.Networks.Consensus;
-using x42.Networks.Policies;
-using x42.Networks.Setup;
 using NBitcoin;
 using NBitcoin.BouncyCastle.Math;
 using NBitcoin.DataEncoders;
 using NBitcoin.Protocol;
-using x42.Networks.Deployments;
 
-namespace x42.Networks
+namespace Blockcore.Networks.x42.Networks
 {
     public class x42Test : x42Main
     {
diff --git a/src/Networks/Blockcore.Networks.x42/x42Setup.cs b/src/Networks/Blockcore.Networks.x42/x42Setup.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
 using Blockcore.Consensus.Checkpoints;
-using x42.Networks;
-using x42.Networks.Setup;
+using Blockcore.Networks.x42.Networks.Setup;
 using NBitcoin;
 
-namespace x42
+namespace Blockcore.Networks.x42
 {
     internal class x42Setup
     {
diff --git a/src/Node/Blockcore.Node/NetworkSelector.cs b/src/Node/Blockcore.Node/NetworkSelector.cs
@@ -1,5 +1,4 @@
 ﻿using Blockcore.Configuration;
-using NBitcoin.Protocol;
 
 namespace Blockcore.Node
 {
@@ -26,7 +25,7 @@ public static NodeSettings Create(string chain, string[] args)
                     break;
 
                 case "X42":
-                    nodeSettings = new NodeSettings(networksSelector: x42.Networks.Networks.x42, args: args);
+                    nodeSettings = new NodeSettings(networksSelector: Blockcore.Networks.x42.Networks.Networks.x42, args: args);
                     break;
 
                 case "XDS":

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using NBitcoin;`
`6`	`6`	`using NBitcoin.BouncyCastle.Math;`
`7`	`7`
`8`		`-namespace x42.Networks.Consensus`
	`8`	`+namespace Blockcore.Networks.x42.Networks.Consensus`
`9`	`9`	`{`
`10`	`10`	`public class x42Consensus : IConsensus`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Blockcore.Consensus;`
`2`	`2`
`3`		`-namespace x42.Networks.Consensus`
	`3`	`+namespace Blockcore.Networks.x42.Networks.Consensus`
`4`	`4`	`{`
`5`	`5`	`public static class x42ConsensusErrors`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`using Blockcore.Consensus;`
`2`		`-using Blockcore.Networks;`
`3`		`-using NBitcoin;`
`4`	`2`
`5`		`-namespace x42.Networks.Consensus`
	`3`	`+namespace Blockcore.Networks.x42.Networks.Consensus`
`6`	`4`	`{`
`7`	`5`	`public class x42PosConsensusOptions : PosConsensusOptions`
`8`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`		`-using Blockcore.Networks;`
`2`		`-using NBitcoin;`
`3`		`-`
`4`		`-namespace x42.Networks`
	`1`	`+namespace Blockcore.Networks.x42.Networks`
`5`	`2`	`{`
`6`		`- public static class Networks`
	`3`	`+ public static class Networks`
`7`	`4`	`{`
`8`	`5`	`public static NetworksSelector x42`
`9`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using Blockcore.Features.Consensus.Rules.UtxosetRules;`
	`2`	`+using Blockcore.Networks.x42.Networks.Consensus;`
`2`	`3`	`using NBitcoin;`
`3`		`-using x42.Networks.Consensus;`
`4`	`4`
`5`		`-namespace x42.Networks.Rules`
	`5`	`+namespace Blockcore.Networks.x42.Networks.Rules`
`6`	`6`	`{`
`7`	`7`	`public sealed class x42PosCoinviewRule : CheckPosUtxosetRule`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Blockcore.Consensus.Checkpoints;`
`4`	`4`	`using NBitcoin;`
`5`	`5`
`6`		`-namespace x42.Networks.Setup`
	`6`	`+namespace Blockcore.Networks.x42.Networks.Setup`
`7`	`7`	`{`
`8`	`8`	`internal class CoinSetup`
`9`	`9`	`{`