Blocks -> BlockRepository.
MODIFY
WalletWasabi.Gui/Global.cs
WalletWasabi.Gui/Global.cs
@@ -371,7 +371,7 @@ namespace WalletWasabi.Gui
new SmartBlockProvider(
new P2pBlockProvider(Nodes, BitcoinCoreNode, Synchronizer, Config.ServiceConfiguration, Network),
Cache),
- BitcoinStore.Blocks);
+ BitcoinStore.BlockRepository);
#endregion Blocks provider

MODIFY
WalletWasabi.Tests/IntegrationTests/P2pTests.cs
WalletWasabi.Tests/IntegrationTests/P2pTests.cs
@@ -103,7 +103,7 @@ namespace WalletWasabi.Tests.IntegrationTests
ServiceConfiguration serviceConfig = new ServiceConfiguration(MixUntilAnonymitySet.PrivacyLevelStrong.ToString(), 2, 21, 50, new IPEndPoint(IPAddress.Loopback, network.DefaultPort), Money.Coins(Constants.DefaultDustThreshold));
CachedBlockProvider blockProvider = new CachedBlockProvider(
new P2pBlockProvider(nodes, null, syncer, serviceConfig, network),
- bitcoinStore.Blocks);
+ bitcoinStore.BlockRepository);
using Wallet wallet = Wallet.CreateAndRegisterServices(
network,

MODIFY
WalletWasabi.Tests/RegressionTests/BuildTests.cs
WalletWasabi.Tests/RegressionTests/BuildTests.cs
@@ -64,7 +64,7 @@ namespace WalletWasabi.Tests.RegressionTests
var workDir = Common.GetWorkDir();
CachedBlockProvider blockProvider = new CachedBlockProvider(
new P2pBlockProvider(nodes, null, synchronizer, serviceConfiguration, network),
- bitcoinStore.Blocks);
+ bitcoinStore.BlockRepository);
using var wallet = Wallet.CreateAndRegisterServices(network, bitcoinStore, keyManager, synchronizer, nodes, workDir, serviceConfiguration, synchronizer, blockProvider);
wallet.NewFilterProcessed += Common.Wallet_NewFilterProcessed;
@@ -227,7 +227,7 @@ namespace WalletWasabi.Tests.RegressionTests
var workDir = Common.GetWorkDir();
CachedBlockProvider blockProvider = new CachedBlockProvider(
new P2pBlockProvider(nodes, null, synchronizer, serviceConfiguration, network),
- bitcoinStore.Blocks);
+ bitcoinStore.BlockRepository);
var walletManager = new WalletManager(network, new WalletDirectories(workDir));
walletManager.RegisterServices(bitcoinStore, synchronizer, nodes, serviceConfiguration, synchronizer, blockProvider);

MODIFY
WalletWasabi.Tests/RegressionTests/CoinJoinTests.cs
WalletWasabi.Tests/RegressionTests/CoinJoinTests.cs
@@ -1386,11 +1386,11 @@ namespace WalletWasabi.Tests.RegressionTests
CachedBlockProvider blockProvider = new CachedBlockProvider(
new P2pBlockProvider(nodes, null, synchronizer, serviceConfiguration, network),
- bitcoinStore.Blocks);
+ bitcoinStore.BlockRepository);
CachedBlockProvider blockProvider2 = new CachedBlockProvider(
new P2pBlockProvider(nodes2, null, synchronizer, serviceConfiguration, network),
- bitcoinStore.Blocks);
+ bitcoinStore.BlockRepository);
using var wallet = Wallet.CreateAndRegisterServices(network, bitcoinStore, keyManager, synchronizer, nodes, workDir, serviceConfiguration, synchronizer, blockProvider);
wallet.NewFilterProcessed += Common.Wallet_NewFilterProcessed;

MODIFY
WalletWasabi.Tests/RegressionTests/SendTests.cs
WalletWasabi.Tests/RegressionTests/SendTests.cs
@@ -63,7 +63,7 @@ namespace WalletWasabi.Tests.RegressionTests
CachedBlockProvider blockProvider = new CachedBlockProvider(
new P2pBlockProvider(nodes, null, synchronizer, serviceConfiguration, network),
- bitcoinStore.Blocks);
+ bitcoinStore.BlockRepository);
var walletManager = new WalletManager(network, new WalletDirectories(workDir));
walletManager.RegisterServices(bitcoinStore, synchronizer, nodes, serviceConfiguration, synchronizer, blockProvider);
@@ -542,7 +542,7 @@ namespace WalletWasabi.Tests.RegressionTests
CachedBlockProvider blockProvider = new CachedBlockProvider(
new P2pBlockProvider(nodes, null, synchronizer, serviceConfiguration, network),
- bitcoinStore.Blocks);
+ bitcoinStore.BlockRepository);
var walletManager = new WalletManager(network, new WalletDirectories(workDir));
walletManager.RegisterServices(bitcoinStore, synchronizer, nodes, serviceConfiguration, synchronizer, blockProvider);
@@ -715,7 +715,7 @@ namespace WalletWasabi.Tests.RegressionTests
CachedBlockProvider blockProvider = new CachedBlockProvider(
new P2pBlockProvider(nodes, null, synchronizer, serviceConfiguration, network),
- bitcoinStore.Blocks);
+ bitcoinStore.BlockRepository);
using var wallet = Wallet.CreateAndRegisterServices(network, bitcoinStore, keyManager, synchronizer, nodes, workDir, serviceConfiguration, synchronizer, blockProvider);
wallet.NewFilterProcessed += Common.Wallet_NewFilterProcessed;

MODIFY
WalletWasabi.Tests/RegressionTests/WalletTests.cs
WalletWasabi.Tests/RegressionTests/WalletTests.cs
@@ -282,7 +282,7 @@ namespace WalletWasabi.Tests.RegressionTests
CachedBlockProvider blockProvider = new CachedBlockProvider(
new P2pBlockProvider(nodes, null, synchronizer, serviceConfiguration, network),
- bitcoinStore.Blocks);
+ bitcoinStore.BlockRepository);
using var wallet = Wallet.CreateAndRegisterServices(network, bitcoinStore, keyManager, synchronizer, nodes, workDir, serviceConfiguration, synchronizer, blockProvider);
wallet.NewFilterProcessed += Common.Wallet_NewFilterProcessed;

MODIFY
WalletWasabi/Stores/BitcoinStore.cs
WalletWasabi/Stores/BitcoinStore.cs
using NBitcoin;
-using System.IO;
using System.Threading.Tasks;
using WalletWasabi.Blockchain.Blocks;
using WalletWasabi.Blockchain.Mempool;
using WalletWasabi.Blockchain.P2p;
using WalletWasabi.Blockchain.Transactions;
-using WalletWasabi.Helpers;
using WalletWasabi.Logging;
using WalletWasabi.Wallets;
@@ -21,12 +19,12 @@ namespace WalletWasabi.Stores
IndexStore indexStore,
AllTransactionStore transactionStore,
MempoolService mempoolService,
- IRepository<uint256, Block> blocks)
+ IRepository<uint256, Block> blockRepository)
{
IndexStore = indexStore;
TransactionStore = transactionStore;
MempoolService = mempoolService;
- Blocks = blocks;
+ BlockRepository = blockRepository;
}
public bool IsInitialized { get; private set; }
@@ -35,7 +33,7 @@ namespace WalletWasabi.Stores
public AllTransactionStore TransactionStore { get; }
public SmartHeaderChain SmartHeaderChain => IndexStore.SmartHeaderChain;
public MempoolService MempoolService { get; }
- public IRepository<uint256, Block> Blocks { get; }
+ public IRepository<uint256, Block> BlockRepository { get; }
/// <summary>
/// This should not be a property, but a creator function, because it'll be cloned left and right by NBitcoin later.

Blocks -> BlockRepository.