Skip to content

Commit f167a2b

Browse files
flcl42flcl42
committed
Move types
1 parent a6e02d9 commit f167a2b

File tree

87 files changed

+239
-224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+239
-224
lines changed

‎src/Nethermind/Nethermind.AuRa.Test/AuraBlockProcessorTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,14 @@
1919
using Nethermind.Core.Specs;
2020
using Nethermind.Core.Test;
2121
using Nethermind.Core.Test.Builders;
22-
using Nethermind.Db;
22+
using Nethermind.Core.Transactions;
2323
using Nethermind.Evm.Tracing;
2424
using Nethermind.Evm.TransactionProcessing;
2525
using Nethermind.Int256;
2626
using Nethermind.Logging;
2727
using Nethermind.Specs;
2828
using Nethermind.Specs.Forks;
2929
using Nethermind.State;
30-
using Nethermind.Trie.Pruning;
31-
using Nethermind.TxPool;
32-
using Nethermind.TxPool.Filters;
3330
using NSubstitute;
3431
using NUnit.Framework;
3532

‎src/Nethermind/Nethermind.AuRa.Test/Transactions/TxCertifierFilterTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919
using Nethermind.Core;
2020
using Nethermind.Core.Specs;
2121
using Nethermind.Core.Test.Builders;
22+
using Nethermind.Core.Transactions;
2223
using Nethermind.Evm.TransactionProcessing;
2324
using Nethermind.Logging;
2425
using Nethermind.State;
25-
using Nethermind.TxPool;
26-
using Nethermind.TxPool.Filters;
2726
using NSubstitute;
2827
using NSubstitute.ExceptionExtensions;
2928
using NUnit.Framework;
@@ -97,8 +96,7 @@ private void ShouldAllowAddress(Address? address, ulong gasPrice = 0ul, bool exp
9796
{
9897
_filter.IsAllowed(
9998
Build.A.Transaction.WithGasPrice(gasPrice).WithSenderAddress(address).TestObject,
100-
Build.A.BlockHeader.TestObject,
101-
null).Equals(AcceptTxResult.Accepted).Should().Be(expected);
99+
Build.A.BlockHeader.TestObject, null).Equals(AcceptTxResult.Accepted).Should().Be(expected);
102100
}
103101

104102
[Test]

‎src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
using Nethermind.Core.Extensions;
2525
using Nethermind.Core.Specs;
2626
using Nethermind.Core.Test.Builders;
27+
using Nethermind.Core.Transactions;
2728
using Nethermind.Crypto;
2829
using Nethermind.Int256;
2930
using Nethermind.Evm.TransactionProcessing;
3031
using Nethermind.Logging;
3132
using Nethermind.State;
32-
using Nethermind.TxPool;
3333
using NSubstitute;
3434
using NUnit.Framework;
3535

‎src/Nethermind/Nethermind.Blockchain.Test/Producers/BlockProducerBaseTests.BaseFee.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Nethermind.Core;
99
using Nethermind.Core.Extensions;
1010
using Nethermind.Core.Test.Builders;
11+
using Nethermind.Core.Transactions;
1112
using Nethermind.Evm;
1213
using Nethermind.Int256;
1314
using Nethermind.JsonRpc.Test.Modules;

‎src/Nethermind/Nethermind.Blockchain.Test/TransactionSelectorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
using Nethermind.Config;
2525
using Nethermind.Core.Crypto;
2626
using Nethermind.Core.Test;
27+
using Nethermind.Core.Transactions;
2728
using Nethermind.Crypto;
28-
using Nethermind.TxPool.Filters;
2929

3030
namespace Nethermind.Blockchain.Test
3131
{

‎src/Nethermind/Nethermind.Blockchain.Test/TxPoolSourceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
using System.Collections.Generic;
1414
using NSubstitute;
1515
using Nethermind.Core.Specs;
16-
using Nethermind.TxPool.Filters;
16+
using Nethermind.Core.Transactions;
1717

1818
namespace Nethermind.Consensus.Producers.Test;
1919

‎src/Nethermind/Nethermind.Clique.Test/CliqueBlockProducerTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
using Nethermind.Logging;
2929
using Nethermind.Specs;
3030
using Nethermind.State;
31-
using Nethermind.Trie.Pruning;
3231
using Nethermind.TxPool;
3332
using NUnit.Framework;
3433
using System;
@@ -39,7 +38,7 @@
3938
using System.Threading.Tasks;
4039
using Nethermind.Consensus.ExecutionRequests;
4140
using Nethermind.Consensus.Withdrawals;
42-
using Nethermind.TxPool.Filters;
41+
using Nethermind.Core.Transactions;
4342

4443
namespace Nethermind.Clique.Test;
4544

‎src/Nethermind/Nethermind.Consensus.AuRa/AuRaBlockProcessor.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
using Nethermind.Consensus.Withdrawals;
1818
using Nethermind.Core;
1919
using Nethermind.Core.Specs;
20+
using Nethermind.Core.Transactions;
2021
using Nethermind.Crypto;
2122
using Nethermind.Evm.Tracing;
2223
using Nethermind.Logging;
2324
using Nethermind.State;
24-
using Nethermind.TxPool;
25-
using Nethermind.TxPool.Filters;
2625

2726
namespace Nethermind.Consensus.AuRa
2827
{

‎src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/InitializeBlockchainAuRa.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
using Nethermind.Consensus.Comparers;
1717
using Nethermind.Consensus.ExecutionRequests;
1818
using Nethermind.Consensus.Processing;
19-
using Nethermind.Consensus.Transactions;
2019
using Nethermind.Core;
20+
using Nethermind.Core.Transactions;
2121
using Nethermind.Evm.TransactionProcessing;
2222
using Nethermind.Init.Steps;
2323
using Nethermind.Logging;
2424
using Nethermind.State;
2525
using Nethermind.TxPool;
2626
using Nethermind.TxPool.Comparison;
27-
using Nethermind.TxPool.Filters;
2827

2928
namespace Nethermind.Consensus.AuRa.InitializationSteps;
3029

‎src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/RegisterAuRaRpcModules.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Autofac;
77
using Nethermind.Blockchain;
88
using Nethermind.Blockchain.BeaconBlockRoot;
9-
using Nethermind.Blockchain.Find;
109
using Nethermind.Blockchain.Receipts;
1110
using Nethermind.Consensus.AuRa.Config;
1211
using Nethermind.Consensus.AuRa.Transactions;
@@ -18,13 +17,13 @@
1817
using Nethermind.Consensus.Withdrawals;
1918
using Nethermind.Core;
2019
using Nethermind.Core.Specs;
20+
using Nethermind.Core.Transactions;
2121
using Nethermind.Evm;
2222
using Nethermind.Evm.TransactionProcessing;
2323
using Nethermind.JsonRpc.Modules.DebugModule;
2424
using Nethermind.JsonRpc.Modules.Trace;
2525
using Nethermind.Logging;
2626
using Nethermind.State;
27-
using Nethermind.TxPool.Filters;
2827

2928
namespace Nethermind.Consensus.AuRa.InitializationSteps;
3029

‎src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/StartBlockProducerAuRa.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
using Nethermind.Core;
2828
using Nethermind.Core.Crypto;
2929
using Nethermind.Core.Specs;
30+
using Nethermind.Core.Transactions;
3031
using Nethermind.Crypto;
3132
using Nethermind.Evm.TransactionProcessing;
3233
using Nethermind.JsonRpc.Modules.Eth.GasPrice;
3334
using Nethermind.Logging;
3435
using Nethermind.Specs.ChainSpecStyle;
3536
using Nethermind.State;
3637
using Nethermind.TxPool;
37-
using Nethermind.TxPool.Filters;
3838

3939
namespace Nethermind.Consensus.AuRa.InitializationSteps;
4040

‎src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/TxAuRaFilterBuilders.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
using Nethermind.Consensus.Transactions;
1414
using Nethermind.Core;
1515
using Nethermind.Core.Specs;
16+
using Nethermind.Core.Transactions;
1617
using Nethermind.Logging;
1718
using Nethermind.Specs.ChainSpecStyle;
18-
using Nethermind.TxPool.Filters;
1919

2020
namespace Nethermind.Consensus.AuRa.InitializationSteps
2121
{

‎src/Nethermind/Nethermind.Consensus.AuRa/Transactions/AcceptTxResultAuRa.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
22
// SPDX-License-Identifier: LGPL-3.0-only
33

4-
using Nethermind.TxPool;
4+
using Nethermind.Core.Transactions;
55

66
namespace Nethermind.Consensus.AuRa.Transactions
77
{

‎src/Nethermind/Nethermind.Consensus.AuRa/Transactions/LocalTxFilter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
22
// SPDX-License-Identifier: LGPL-3.0-only
33

4+
using Nethermind.Consensus.Transactions;
45
using Nethermind.Core;
56
using Nethermind.Core.Specs;
6-
using Nethermind.TxPool;
7-
using Nethermind.TxPool.Filters;
7+
using Nethermind.Core.Transactions;
88

99
namespace Nethermind.Consensus.AuRa.Transactions
1010
{

‎src/Nethermind/Nethermind.Consensus.AuRa/Transactions/MinGasPriceContractTxFilter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
using Nethermind.Consensus.Transactions;
88
using Nethermind.Core;
99
using Nethermind.Core.Specs;
10-
using Nethermind.TxPool;
11-
using Nethermind.TxPool.Filters;
10+
using Nethermind.Core.Transactions;
1211

1312
namespace Nethermind.Consensus.AuRa.Transactions
1413
{

‎src/Nethermind/Nethermind.Consensus.AuRa/Transactions/ServiceTxFilter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
using Nethermind.Core;
55
using Nethermind.Core.Specs;
6-
using Nethermind.TxPool;
7-
using Nethermind.TxPool.Filters;
6+
using Nethermind.Core.Transactions;
87

98
namespace Nethermind.Consensus.AuRa.Transactions
109
{

‎src/Nethermind/Nethermind.Consensus.AuRa/Transactions/TxCertifierFilter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
using System.Collections.Generic;
55
using Nethermind.Abi;
66
using Nethermind.Consensus.AuRa.Contracts;
7+
using Nethermind.Consensus.Transactions;
78
using Nethermind.Core;
89
using Nethermind.Core.Crypto;
910
using Nethermind.Core.Resettables;
1011
using Nethermind.Core.Specs;
12+
using Nethermind.Core.Transactions;
1113
using Nethermind.Logging;
12-
using Nethermind.TxPool;
13-
using Nethermind.TxPool.Filters;
1414

1515
namespace Nethermind.Consensus.AuRa.Transactions;
1616

‎src/Nethermind/Nethermind.Consensus.AuRa/Transactions/TxGasPriceSender.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Threading.Tasks;
66
using Nethermind.Core;
77
using Nethermind.Core.Crypto;
8+
using Nethermind.Core.Transactions;
89
using Nethermind.Int256;
910
using Nethermind.JsonRpc.Modules.Eth.GasPrice;
1011
using Nethermind.TxPool;

‎src/Nethermind/Nethermind.Consensus.AuRa/Transactions/TxPermissionFilter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
using Nethermind.Core.Crypto;
99
using Nethermind.Core.Specs;
1010
using Nethermind.Logging;
11-
using Nethermind.TxPool;
12-
using Nethermind.TxPool.Filters;
1311
using System;
12+
using Nethermind.Core.Transactions;
1413

1514
namespace Nethermind.Consensus.AuRa.Transactions
1615
{

‎src/Nethermind/Nethermind.Consensus.AuRa/Transactions/TxPriorityTxSource.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
using Nethermind.Consensus.AuRa.Contracts.DataStore;
99
using Nethermind.Consensus.Comparers;
1010
using Nethermind.Consensus.Producers;
11+
using Nethermind.Consensus.Transactions;
1112
using Nethermind.Core;
1213
using Nethermind.Core.Specs;
14+
using Nethermind.Core.Transactions;
1315
using Nethermind.Logging;
1416
using Nethermind.State;
1517
using Nethermind.TxPool;
16-
using Nethermind.TxPool.Filters;
1718

1819
namespace Nethermind.Consensus.AuRa.Transactions
1920
{

‎src/Nethermind/Nethermind.Consensus.Ethash/NethDevBlockProducerTxSourceFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
using Nethermind.Consensus.Producers;
77
using Nethermind.Consensus.Transactions;
88
using Nethermind.Core.Specs;
9+
using Nethermind.Core.Transactions;
910
using Nethermind.Logging;
1011
using Nethermind.TxPool;
11-
using Nethermind.TxPool.Filters;
1212

1313
namespace Nethermind.Consensus.Ethash;
1414

‎src/Nethermind/Nethermind.Consensus.Test/CensorshipDetectorTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
1616
using Nethermind.Core.Specs;
1717
using Nethermind.Core.Test;
1818
using Nethermind.Core.Test.Builders;
19+
using Nethermind.Core.Transactions;
1920
using Nethermind.Crypto;
20-
using Nethermind.Db;
2121
using Nethermind.Evm;
2222
using Nethermind.Logging;
2323
using Nethermind.Specs;
2424
using Nethermind.State;
25-
using Nethermind.Trie.Pruning;
2625
using Nethermind.TxPool;
2726
using NSubstitute;
2827
using NUnit.Framework;

‎src/Nethermind/Nethermind.Consensus/Producers/TxPoolTxSource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
using Nethermind.Core.Collections;
1414
using Nethermind.Core.Extensions;
1515
using Nethermind.Core.Specs;
16+
using Nethermind.Core.Transactions;
1617
using Nethermind.Evm;
1718
using Nethermind.Int256;
1819
using Nethermind.Logging;
1920
using Nethermind.TxPool;
2021
using Nethermind.TxPool.Comparison;
21-
using Nethermind.TxPool.Filters;
2222

2323
[assembly: InternalsVisibleTo("Nethermind.AuRa.Test")]
2424

‎src/Nethermind/Nethermind.Consensus/Producers/TxPoolTxSourceFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
using Nethermind.Consensus.Comparers;
66
using Nethermind.Consensus.Transactions;
77
using Nethermind.Core.Specs;
8+
using Nethermind.Core.Transactions;
89
using Nethermind.Logging;
910
using Nethermind.TxPool;
10-
using Nethermind.TxPool.Filters;
1111

1212
namespace Nethermind.Consensus.Producers
1313
{

‎src/Nethermind/Nethermind.Consensus/Transactions/BaseFeeTxFilter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
using Nethermind.Core;
55
using Nethermind.Core.Specs;
6+
using Nethermind.Core.Transactions;
67
using Nethermind.Int256;
7-
using Nethermind.TxPool;
8-
using Nethermind.TxPool.Filters;
98

109
namespace Nethermind.Consensus.Transactions
1110
{

‎src/Nethermind/Nethermind.Consensus/Transactions/BlobLimitTxFilter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
using Nethermind.Core;
55
using Nethermind.Core.Specs;
6-
using Nethermind.TxPool;
7-
using Nethermind.TxPool.Filters;
6+
using Nethermind.Core.Transactions;
87

98
namespace Nethermind.Consensus.Transactions;
109

‎src/Nethermind/Nethermind.Consensus/Transactions/CompositeTxFilter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
using Nethermind.Core;
55
using Nethermind.Core.Specs;
6-
using Nethermind.TxPool;
7-
using Nethermind.TxPool.Filters;
86
using System.Linq;
7+
using Nethermind.Core.Transactions;
98

109
namespace Nethermind.Consensus.Transactions
1110
{

‎src/Nethermind/Nethermind.Consensus/Transactions/FilteredTxSource.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
using Nethermind.Core;
77
using Nethermind.Core.Specs;
88
using Nethermind.Logging;
9-
using Nethermind.TxPool;
10-
using Nethermind.TxPool.Filters;
119
using System;
1210
using System.Collections.Generic;
11+
using Nethermind.Core.Transactions;
1312

1413
namespace Nethermind.Consensus.Transactions;
1514

‎src/Nethermind/Nethermind.Consensus/Transactions/IMinGasPriceTxFilter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
using Nethermind.Core;
55
using Nethermind.Core.Specs;
6+
using Nethermind.Core.Transactions;
67
using Nethermind.Int256;
7-
using Nethermind.TxPool;
8-
using Nethermind.TxPool.Filters;
98

109
namespace Nethermind.Consensus.Transactions
1110
{

‎src/Nethermind/Nethermind.Consensus/Transactions/MinGasPriceTxFilter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using Nethermind.Config;
55
using Nethermind.Core;
66
using Nethermind.Core.Specs;
7+
using Nethermind.Core.Transactions;
78
using Nethermind.Int256;
8-
using Nethermind.TxPool;
99

1010
namespace Nethermind.Consensus.Transactions;
1111

‎src/Nethermind/Nethermind.Consensus/Transactions/NullTxFilter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
using Nethermind.Core;
55
using Nethermind.Core.Specs;
6-
using Nethermind.TxPool;
7-
using Nethermind.TxPool.Filters;
6+
using Nethermind.Core.Transactions;
87

98
namespace Nethermind.Consensus.Transactions
109
{

0 commit comments

Comments
 (0)