Pass index file path by parameter (WalletWasabi#13368)

Co-authored-by: Turbolay <[email protected]>
Kukks · Sep 7, 2024 · 88ab412 · 88ab412
1 parent 15f0384
commit 88ab412
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/WalletWasabi.Backend/Global.cs b/WalletWasabi.Backend/Global.cs
@@ -43,7 +43,7 @@ public Global(string dataDir, IRPCClient rpcClient, Config config)
 		// Initialize index building
 		var indexBuilderServiceDir = Path.Combine(DataDir, "IndexBuilderService");
 		var indexFilePath = Path.Combine(indexBuilderServiceDir, $"Index{RpcClient.Network}.dat");
-		IndexBuilderService = new(RpcClient, HostedServices.Get<BlockNotifier>());
+		IndexBuilderService = new(RpcClient, HostedServices.Get<BlockNotifier>(), indexFilePath);
 	}
 
 	public string DataDir { get; }

diff --git a/WalletWasabi.Tests/RegressionTests/BackendTests.cs b/WalletWasabi.Tests/RegressionTests/BackendTests.cs
@@ -244,7 +244,7 @@ public async Task FilterBuilderTestAsync()
 		var indexBuilderServiceDir = Helpers.Common.GetWorkDir();
 		var indexFilePath = Path.Combine(indexBuilderServiceDir, $"Index{rpc.Network}.dat");
 
-		IndexBuilderService indexBuilderService = new(rpc, global.HostedServices.Get<BlockNotifier>());
+		IndexBuilderService indexBuilderService = new(rpc, global.HostedServices.Get<BlockNotifier>(), "filters.txt");
 		try
 		{
 			indexBuilderService.Synchronize();

diff --git a/WalletWasabi.Tests/UnitTests/BitcoinCore/IndexBuilderServiceTests.cs b/WalletWasabi.Tests/UnitTests/BitcoinCore/IndexBuilderServiceTests.cs
@@ -28,7 +28,7 @@ public async Task SegwitTaprootUnsynchronizedBitcoinNodeAsync()
 			}),
 		};
 		using var blockNotifier = new BlockNotifier(rpc);
-		var indexer = new IndexBuilderService(rpc, blockNotifier);
+		var indexer = new IndexBuilderService(rpc, blockNotifier, "filters.txt");
 
 		indexer.Synchronize();
 
@@ -55,7 +55,7 @@ public async Task SegwitTaprootStalledBitcoinNodeAsync()
 			}
 		};
 		using var blockNotifier = new BlockNotifier(rpc);
-		var indexer = new IndexBuilderService(rpc, blockNotifier);
+		var indexer = new IndexBuilderService(rpc, blockNotifier, "filters.txt");
 
 		indexer.Synchronize();
 
@@ -86,7 +86,7 @@ public async Task SegwitTaprootSynchronizingBitcoinNodeAsync()
 			OnGetVerboseBlockAsync = (hash) => Task.FromResult(blockchain.Single(x => x.Hash == hash))
 		};
 		using var blockNotifier = new BlockNotifier(rpc);
-		var indexer = new IndexBuilderService(rpc, blockNotifier);
+		var indexer = new IndexBuilderService(rpc, blockNotifier, "filters.txt");
 
 		indexer.Synchronize();
 
@@ -156,7 +156,7 @@ public async Task SegwitTaprootSynchronizedBitcoinNodeAsync()
 			OnGetVerboseBlockAsync = (hash) => Task.FromResult(blockchain.Single(x => x.Hash == hash))
 		};
 		using var blockNotifier = new BlockNotifier(rpc);
-		var indexer = new IndexBuilderService(rpc, blockNotifier);
+		var indexer = new IndexBuilderService(rpc, blockNotifier, "filters.txt");
 
 		indexer.Synchronize();
 
@@ -182,7 +182,7 @@ public async Task TaprootUnsynchronizedBitcoinNodeAsync()
 			}),
 		};
 		using var blockNotifier = new BlockNotifier(rpc);
-		var indexer = new IndexBuilderService(rpc, blockNotifier);
+		var indexer = new IndexBuilderService(rpc, blockNotifier, "filters.txt");
 
 		indexer.Synchronize();
 
@@ -209,7 +209,7 @@ public async Task TaprootStalledBitcoinNodeAsync()
 			}
 		};
 		using var blockNotifier = new BlockNotifier(rpc);
-		var indexer = new IndexBuilderService(rpc, blockNotifier);
+		var indexer = new IndexBuilderService(rpc, blockNotifier, "filters.txt");
 
 		indexer.Synchronize();
 
@@ -240,7 +240,7 @@ public async Task TaprootSynchronizingBitcoinNodeAsync()
 			OnGetVerboseBlockAsync = (hash) => Task.FromResult(blockchain.Single(x => x.Hash == hash))
 		};
 		using var blockNotifier = new BlockNotifier(rpc);
-		var indexer = new IndexBuilderService(rpc, blockNotifier);
+		var indexer = new IndexBuilderService(rpc, blockNotifier, "filters.txt");
 
 		indexer.Synchronize();
 
@@ -268,7 +268,7 @@ public async Task TaprootSynchronizedBitcoinNodeAsync()
 			OnGetVerboseBlockAsync = (hash) => Task.FromResult(blockchain.Single(x => x.Hash == hash))
 		};
 		using var blockNotifier = new BlockNotifier(rpc);
-		var indexer = new IndexBuilderService(rpc, blockNotifier);
+		var indexer = new IndexBuilderService(rpc, blockNotifier, "filters.txt");
 
 		indexer.Synchronize();
 

diff --git a/WalletWasabi/Blockchain/BlockFilters/IndexBuilderService.cs b/WalletWasabi/Blockchain/BlockFilters/IndexBuilderService.cs
@@ -29,12 +29,10 @@ public class IndexBuilderService
 
 	private long _workerCount;
 
-	public IndexBuilderService(IRPCClient rpc, BlockNotifier blockNotifier)
+	public IndexBuilderService(IRPCClient rpc, BlockNotifier blockNotifier, string indexFilePath)
 	{
 		RpcClient = Guard.NotNull(nameof(rpc), rpc);
 		BlockNotifier = Guard.NotNull(nameof(blockNotifier), blockNotifier);
-		var indexBuilderServiceDir = Path.Combine(".", "IndexBuilderService");
-		var indexFilePath = Path.Combine(indexBuilderServiceDir, $"Index{rpc.Network}.dat");
 
 		IndexFilePath = Guard.NotNullOrEmptyOrWhitespace(nameof(indexFilePath), indexFilePath);
 		StartingHeight = SmartHeader.GetStartingHeader(RpcClient.Network).Height;