From 7aaf2ae49f413bb5611f725ce18e3d9e7802fa1c Mon Sep 17 00:00:00 2001 From: dangershony Date: Tue, 14 Nov 2023 18:50:37 +0000 Subject: [PATCH] Move the folder protocol to the test project --- src/Angor.Test/DerivationOperationsTest.cs | 1 - src/Angor.Test/InvestmentOperationsTest.cs | 1 + src/{Angor/Shared => Angor.Test}/Protocol/AngorScripts.cs | 3 ++- .../Shared => Angor.Test}/Protocol/InvestmentOperations.cs | 7 ++++--- .../Shared => Angor.Test}/Protocol/ProjectOperations.cs | 2 +- src/{Angor/Shared => Angor.Test}/Protocol/ScriptBuilder.cs | 3 ++- src/Angor.Test/ProtocolNew/FounderTransactionActionTest.cs | 1 + src/Angor.Test/ProtocolNew/InvestmentIntegrationsTests.cs | 1 + src/Angor.Test/ScriptTest.cs | 2 +- src/Angor.Test/ScriptThresholdTest.cs | 2 +- src/Angor/Client/Pages/Invest.razor | 1 - .../Shared/ProtocolNew/Scripts/TaprootScriptBuilder.cs | 1 - .../TransactionBuilders/InvestmentTransactionBuilder.cs | 1 - 13 files changed, 14 insertions(+), 12 deletions(-) rename src/{Angor/Shared => Angor.Test}/Protocol/AngorScripts.cs (99%) rename src/{Angor/Shared => Angor.Test}/Protocol/InvestmentOperations.cs (99%) rename src/{Angor/Shared => Angor.Test}/Protocol/ProjectOperations.cs (96%) rename src/{Angor/Shared => Angor.Test}/Protocol/ScriptBuilder.cs (99%) diff --git a/src/Angor.Test/DerivationOperationsTest.cs b/src/Angor.Test/DerivationOperationsTest.cs index 6296b3cf..dd856d3c 100644 --- a/src/Angor.Test/DerivationOperationsTest.cs +++ b/src/Angor.Test/DerivationOperationsTest.cs @@ -1,7 +1,6 @@ using Angor.Shared; using Angor.Shared.Models; using Angor.Shared.Networks; -using Angor.Shared.Protocol; using Blockcore.Consensus.ScriptInfo; using Blockcore.NBitcoin; using Blockcore.NBitcoin.BIP32; diff --git a/src/Angor.Test/InvestmentOperationsTest.cs b/src/Angor.Test/InvestmentOperationsTest.cs index c3f8ef5d..24cf98ee 100644 --- a/src/Angor.Test/InvestmentOperationsTest.cs +++ b/src/Angor.Test/InvestmentOperationsTest.cs @@ -1,6 +1,7 @@ using Angor.Shared; using Angor.Shared.Models; using Angor.Shared.Networks; +using Angor.Test.Protocol; using Blockcore.NBitcoin; using Blockcore.NBitcoin.Crypto; using Blockcore.NBitcoin.DataEncoders; diff --git a/src/Angor/Shared/Protocol/AngorScripts.cs b/src/Angor.Test/Protocol/AngorScripts.cs similarity index 99% rename from src/Angor/Shared/Protocol/AngorScripts.cs rename to src/Angor.Test/Protocol/AngorScripts.cs index 2c3a32c5..72331d71 100644 --- a/src/Angor/Shared/Protocol/AngorScripts.cs +++ b/src/Angor.Test/Protocol/AngorScripts.cs @@ -1,5 +1,6 @@ using System.Linq.Expressions; using System.Text; +using Angor.Shared; using Angor.Shared.Models; using Blockcore.NBitcoin; using NBitcoin; @@ -7,7 +8,7 @@ using Script = Blockcore.Consensus.ScriptInfo.Script; -namespace Angor.Shared.Protocol +namespace Angor.Test.Protocol { public class AngorScripts { diff --git a/src/Angor/Shared/Protocol/InvestmentOperations.cs b/src/Angor.Test/Protocol/InvestmentOperations.cs similarity index 99% rename from src/Angor/Shared/Protocol/InvestmentOperations.cs rename to src/Angor.Test/Protocol/InvestmentOperations.cs index 639621a2..fc8a562d 100644 --- a/src/Angor/Shared/Protocol/InvestmentOperations.cs +++ b/src/Angor.Test/Protocol/InvestmentOperations.cs @@ -1,10 +1,9 @@ -using Angor.Shared; +using System.Text; +using Angor.Shared; using Angor.Shared.Models; -using Angor.Shared.Protocol; using Blockcore.NBitcoin.DataEncoders; using NBitcoin; using NBitcoin.Policy; -using System.Text; using BitcoinAddress = Blockcore.NBitcoin.BitcoinAddress; using FeeRate = Blockcore.NBitcoin.FeeRate; using IndexedTxOut = NBitcoin.IndexedTxOut; @@ -21,6 +20,8 @@ using Utils = NBitcoin.Utils; using WitScript = NBitcoin.WitScript; +namespace Angor.Test.Protocol; + public class InvestmentOperations { private readonly IWalletOperations _walletOperations; diff --git a/src/Angor/Shared/Protocol/ProjectOperations.cs b/src/Angor.Test/Protocol/ProjectOperations.cs similarity index 96% rename from src/Angor/Shared/Protocol/ProjectOperations.cs rename to src/Angor.Test/Protocol/ProjectOperations.cs index e3aae87d..227b9745 100644 --- a/src/Angor/Shared/Protocol/ProjectOperations.cs +++ b/src/Angor.Test/Protocol/ProjectOperations.cs @@ -3,7 +3,7 @@ using Blockcore.NBitcoin; using Blockcore.Networks; -namespace Angor.Shared.Protocol; +namespace Angor.Test.Protocol; public class ProjectOperations { diff --git a/src/Angor/Shared/Protocol/ScriptBuilder.cs b/src/Angor.Test/Protocol/ScriptBuilder.cs similarity index 99% rename from src/Angor/Shared/Protocol/ScriptBuilder.cs rename to src/Angor.Test/Protocol/ScriptBuilder.cs index 60718481..98565fa0 100644 --- a/src/Angor/Shared/Protocol/ScriptBuilder.cs +++ b/src/Angor.Test/Protocol/ScriptBuilder.cs @@ -1,8 +1,9 @@ +using Angor.Shared; using Angor.Shared.Models; using Blockcore.Consensus.ScriptInfo; using Blockcore.NBitcoin; -namespace Angor.Shared.Protocol; +namespace Angor.Test.Protocol; public class ScriptBuilder { diff --git a/src/Angor.Test/ProtocolNew/FounderTransactionActionTest.cs b/src/Angor.Test/ProtocolNew/FounderTransactionActionTest.cs index 0a872625..a13e0046 100644 --- a/src/Angor.Test/ProtocolNew/FounderTransactionActionTest.cs +++ b/src/Angor.Test/ProtocolNew/FounderTransactionActionTest.cs @@ -4,6 +4,7 @@ using Angor.Shared.ProtocolNew; using Angor.Shared.ProtocolNew.Scripts; using Angor.Shared.ProtocolNew.TransactionBuilders; +using Angor.Test.Protocol; using Blockcore.NBitcoin; using Blockcore.NBitcoin.DataEncoders; using Microsoft.Extensions.Logging.Abstractions; diff --git a/src/Angor.Test/ProtocolNew/InvestmentIntegrationsTests.cs b/src/Angor.Test/ProtocolNew/InvestmentIntegrationsTests.cs index b7a1c671..c35c4f37 100644 --- a/src/Angor.Test/ProtocolNew/InvestmentIntegrationsTests.cs +++ b/src/Angor.Test/ProtocolNew/InvestmentIntegrationsTests.cs @@ -4,6 +4,7 @@ using Angor.Shared.ProtocolNew; using Angor.Shared.ProtocolNew.Scripts; using Angor.Shared.ProtocolNew.TransactionBuilders; +using Angor.Test.Protocol; using Blockcore.Consensus.ScriptInfo; using Blockcore.Consensus.TransactionInfo; using Blockcore.NBitcoin; diff --git a/src/Angor.Test/ScriptTest.cs b/src/Angor.Test/ScriptTest.cs index 3729d6ed..2f7f2935 100644 --- a/src/Angor.Test/ScriptTest.cs +++ b/src/Angor.Test/ScriptTest.cs @@ -1,7 +1,7 @@ using Angor.Shared; using Angor.Shared.Models; using Angor.Shared.Networks; -using Angor.Shared.Protocol; +using Angor.Test.Protocol; using Blockcore.NBitcoin; using Blockcore.NBitcoin.Crypto; diff --git a/src/Angor.Test/ScriptThresholdTest.cs b/src/Angor.Test/ScriptThresholdTest.cs index 3b613049..87063fa9 100644 --- a/src/Angor.Test/ScriptThresholdTest.cs +++ b/src/Angor.Test/ScriptThresholdTest.cs @@ -1,5 +1,5 @@ using Angor.Shared; -using Angor.Shared.Protocol; +using Angor.Test.Protocol; namespace Angor.Test { diff --git a/src/Angor/Client/Pages/Invest.razor b/src/Angor/Client/Pages/Invest.razor index 3c6ea5b1..bb7f03db 100644 --- a/src/Angor/Client/Pages/Invest.razor +++ b/src/Angor/Client/Pages/Invest.razor @@ -2,7 +2,6 @@ @using Angor.Shared @using Angor.Client.Storage @using Angor.Shared.Models -@using Angor.Shared.Protocol @using Blockcore.Consensus.TransactionInfo @using Blockcore.NBitcoin @using Angor.Client.Services diff --git a/src/Angor/Shared/ProtocolNew/Scripts/TaprootScriptBuilder.cs b/src/Angor/Shared/ProtocolNew/Scripts/TaprootScriptBuilder.cs index 7adf2112..4365cf29 100644 --- a/src/Angor/Shared/ProtocolNew/Scripts/TaprootScriptBuilder.cs +++ b/src/Angor/Shared/ProtocolNew/Scripts/TaprootScriptBuilder.cs @@ -1,7 +1,6 @@ using System.Linq.Expressions; using System.Text; using Angor.Shared.Models; -using Angor.Shared.Protocol; using Blockcore.NBitcoin; using NBitcoin; using NBitcoin.Crypto; diff --git a/src/Angor/Shared/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilder.cs b/src/Angor/Shared/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilder.cs index 1f894f08..867ed8e6 100644 --- a/src/Angor/Shared/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilder.cs +++ b/src/Angor/Shared/ProtocolNew/TransactionBuilders/InvestmentTransactionBuilder.cs @@ -1,5 +1,4 @@ using Angor.Shared.Models; -using Angor.Shared.Protocol; using Angor.Shared.ProtocolNew.Scripts; using Blockcore.Consensus.ScriptInfo; using Blockcore.Consensus.TransactionInfo;