Skip to content

Commit

Permalink
Remove PathMaps (#13059)
Browse files Browse the repository at this point in the history 
`PathMap` creates problems for non-windows devs who need, at least in vscode, to modify the project files to run/debug.
  • Loading branch information
@lontivero
lontivero committed May 21, 2024
1 parent 389ff6c commit e1f0e14
Show file tree
Hide file tree
Showing 51 changed files with 200 additions and 267 deletions.
1 change: 0 additions & 1 deletion WalletWasabi.Backend/WalletWasabi.Backend.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<PackageTags>walletwasabi, wasabiwallet, wasabi, wallet, bitcoin, nbitcoin, tor, zerolink, wabisabi, coinjoin, fungibility, privacy, anonymity</PackageTags>
<RepositoryType>Git</RepositoryType>
<RepositoryUrl>https://github.com/zkSNACKs/WalletWasabi/</RepositoryUrl>
<PathMap>$(MSBuildProjectDirectory)\=WalletWasabi.Backend</PathMap>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions WalletWasabi.Daemon/Global.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ public async Task DisposeAsync()

using (await InitializationAsyncLock.LockAsync())
{
Logger.LogWarning("Process is exiting.", nameof(Global));
Logger.LogWarning("Process is exiting.");

try
{
Expand All @@ -434,7 +434,7 @@ public async Task DisposeAsync()
using var dequeueCts = new CancellationTokenSource(TimeSpan.FromMinutes(6));
await WalletManager.RemoveAndStopAllAsync(dequeueCts.Token).ConfigureAwait(false);
WalletManager.WalletStateChanged -= WalletManager_WalletStateChanged;
Logger.LogInfo($"{nameof(WalletManager)} is stopped.", nameof(Global));
Logger.LogInfo($"{nameof(WalletManager)} is stopped.");
}
catch (Exception ex)
{
Expand All @@ -447,7 +447,7 @@ public async Task DisposeAsync()
{
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(21));
await rpcServer.StopAsync(cts.Token).ConfigureAwait(false);
Logger.LogInfo($"{nameof(RpcServer)} is stopped.", nameof(Global));
Logger.LogInfo($"{nameof(RpcServer)} is stopped.");
}

if (BlockDownloadService is { } blockDownloadService)
Expand Down
1 change: 0 additions & 1 deletion WalletWasabi.Daemon/WalletWasabi.Daemon.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<PathMap>$(MSBuildProjectDirectory)\=WalletWasabi.Daemon</PathMap>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down
1 change: 0 additions & 1 deletion WalletWasabi.Fluent.Desktop/WalletWasabi.Fluent.Desktop.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<PathMap>$(MSBuildProjectDirectory)\=WalletWasabi.Fluent.Desktop</PathMap>
</PropertyGroup>

<PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion WalletWasabi.Fluent.Generators/WalletWasabi.Fluent.Generators.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)\$(TargetFramework)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<PathMap>$(MSBuildProjectDirectory)\=WalletWasabi.Fluent.Generators</PathMap>
<IsRoslynComponent>true</IsRoslynComponent>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion WalletWasabi.Fluent/WalletWasabi.Fluent.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)\$(TargetFramework)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<PathMap>$(MSBuildProjectDirectory)\=WalletWasabi.Fluent</PathMap>
<AvaloniaNameGeneratorIsEnabled>false</AvaloniaNameGeneratorIsEnabled>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion WalletWasabi.Packager/WalletWasabi.Packager.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64;osx-arm64;</RuntimeIdentifiers>
<PathMap>$(MSBuildProjectDirectory)\=WalletWasabi.Packager</PathMap>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down
8 changes: 4 additions & 4 deletions WalletWasabi.Tests/Helpers/Common.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ static Common()

public static string DataDir => EnvironmentHelpers.GetDataDir(Path.Combine("WalletWasabi", "Tests"));

public static string GetWorkDir([CallerFilePath] string callerFilePath = "", [CallerMemberName] string callerMemberName = "")
public static string GetWorkDir(string path)
{
return Path.Combine(DataDir, EnvironmentHelpers.ExtractFileName(callerFilePath), callerMemberName);
return Path.Combine(DataDir, path);
}

/// <summary>
/// Gets an empty directory for test to work with.
/// </summary>
/// <remarks>If the directory exists, its content is removed.</remarks>
public static async Task<string> GetEmptyWorkDirAsync([CallerFilePath] string callerFilePath = "", [CallerMemberName] string callerMemberName = "")
public static async Task<string> GetEmptyWorkDirAsync(string path)
{
string workDirectory = GetWorkDir(callerFilePath, callerMemberName);
string workDirectory = GetWorkDir(path);

if (Directory.Exists(workDirectory))
{
Expand Down
14 changes: 7 additions & 7 deletions WalletWasabi.Tests/Helpers/TestNodeBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ namespace WalletWasabi.Tests.Helpers;

public static class TestNodeBuilder
{
public static async Task<CoreNode> CreateAsync([CallerFilePath] string callerFilePath = "", [CallerMemberName] string callerMemberName = "", string additionalFolder = "", MempoolService? mempoolService = null)
public static async Task<CoreNode> CreateAsync(string path)
{
var dataDir = Path.Combine(Common.GetWorkDir(callerFilePath, callerMemberName), additionalFolder);
var dataDir = Common.GetWorkDir(path);

CoreNodeParams nodeParameters = CreateDefaultCoreNodeParams(mempoolService ?? new MempoolService(), dataDir);
CoreNodeParams nodeParameters = CreateDefaultCoreNodeParams(new MempoolService(), dataDir);
return await CoreNode.CreateAsync(
nodeParameters,
CancellationToken.None);
}

public static async Task<CoreNode> CreateForHeavyConcurrencyAsync([CallerFilePath] string callerFilePath = "", [CallerMemberName] string callerMemberName = "", string additionalFolder = "", MempoolService? mempoolService = null)
public static async Task<CoreNode> CreateForHeavyConcurrencyAsync(string path)
{
var dataDir = Path.Combine(Common.GetWorkDir(callerFilePath, callerMemberName), additionalFolder);
var dataDir = Common.GetWorkDir(path);

CoreNodeParams nodeParameters = CreateDefaultCoreNodeParams(mempoolService ?? new MempoolService(), dataDir);
CoreNodeParams nodeParameters = CreateDefaultCoreNodeParams(new MempoolService(), dataDir);
nodeParameters.RpcWorkQueue = 32;
return await CoreNode.CreateAsync(
nodeParameters,
Expand All @@ -38,7 +38,7 @@ private static CoreNodeParams CreateDefaultCoreNodeParams(MempoolService mempool
{
var nodeParameters = new CoreNodeParams(
Network.RegTest,
mempoolService ?? new MempoolService(),
mempoolService,
dataDir,
tryRestart: true,
tryDeleteDataDir: true,
Expand Down
2 changes: 1 addition & 1 deletion WalletWasabi.Tests/IntegrationTests/P2pTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public async Task TestServicesAsync(string networkString)
throw new NotSupportedNetworkException(network);
}

var dataDir = Common.GetWorkDir();
var dataDir = Common.GetWorkDir($"{nameof(TestServicesAsync)}");

SmartHeaderChain smartHeaderChain = new();
await using var indexStore = new IndexStore(Path.Combine(dataDir, "indexStore"), network, smartHeaderChain);
Expand Down
12 changes: 6 additions & 6 deletions WalletWasabi.Tests/RegressionTests/BackendTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public async Task GetClientVersionAsync()
[Fact]
public async Task BroadcastReplayTxAsync()
{
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(GetClientVersionAsync));
IRPCClient rpc = setup.RpcClient;

var utxos = await rpc.ListUnspentAsync();
Expand All @@ -102,7 +102,7 @@ public async Task BroadcastReplayTxAsync()
[Fact]
public async Task BroadcastInvalidTxAsync()
{
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(BroadcastReplayTxAsync));

using StringContent content = new($"''", Encoding.UTF8, "application/json");

Expand All @@ -122,7 +122,7 @@ public async Task GetUnconfirmedTxChainAsync()
{
#region Initialize

await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(BroadcastInvalidTxAsync));
IRPCClient rpc = setup.RpcClient;
Network network = setup.Network;
BitcoinStore bitcoinStore = setup.BitcoinStore;
Expand Down Expand Up @@ -151,7 +151,7 @@ public async Task GetUnconfirmedTxChainAsync()
var keyManager = KeyManager.CreateNew(out _, password, network);

// 5. Create wallet service.
var workDir = Helpers.Common.GetWorkDir();
var workDir = Common.GetWorkDir(nameof(GetUnconfirmedTxChainAsync));

using MemoryCache cache = BitcoinFactory.CreateMemoryCache();
await using SpecificNodeBlockProvider specificNodeBlockProvider = new(network, serviceConfiguration, httpClientFactory.TorEndpoint);
Expand Down Expand Up @@ -242,11 +242,11 @@ public async Task GetUnconfirmedTxChainAsync()
[Fact]
public async Task FilterBuilderTestAsync()
{
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(GetUnconfirmedTxChainAsync));
IRPCClient rpc = setup.RpcClient;
using Backend.Global global = setup.Global;

var indexBuilderServiceDir = Helpers.Common.GetWorkDir();
var indexBuilderServiceDir = Common.GetWorkDir(nameof(FilterBuilderTestAsync));
var indexFilePath = Path.Combine(indexBuilderServiceDir, $"Index{rpc.Network}.dat");

IndexBuilderService indexBuilderService = new(IndexType.SegwitTaproot, rpc, global.HostedServices.Get<BlockNotifier>(), indexFilePath);
Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Tests/RegressionTests/BuildTransactionReorgsTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public async Task BuildTransactionReorgsTestAsync()
{
using CancellationTokenSource testDeadlineCts = new(TimeSpan.FromMinutes(5));

await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(BuildTransactionReorgsTestAsync));
IRPCClient rpc = setup.RpcClient;
Network network = setup.Network;
BitcoinStore bitcoinStore = setup.BitcoinStore;
Expand Down Expand Up @@ -69,7 +69,7 @@ public async Task BuildTransactionReorgsTestAsync()
var keyManager = KeyManager.CreateNew(out _, password, network);

// 5. Create wallet service.
var workDir = Helpers.Common.GetWorkDir();
var workDir = Helpers.Common.GetWorkDir(nameof(BuildTransactionReorgsTestAsync));

using MemoryCache cache = CreateMemoryCache();
await using SpecificNodeBlockProvider specificNodeBlockProvider = new(network, serviceConfiguration, httpClientFactory.TorEndpoint);
Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Tests/RegressionTests/BuildTransactionValidationsTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public async Task BuildTransactionValidationsTestAsync()
{
using CancellationTokenSource testDeadlineCts = new(TimeSpan.FromMinutes(3));

await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(BuildTransactionValidationsTestAsync));
IRPCClient rpc = setup.RpcClient;
Network network = setup.Network;
BitcoinStore bitcoinStore = setup.BitcoinStore;
Expand All @@ -70,7 +70,7 @@ public async Task BuildTransactionValidationsTestAsync()
var keyManager = KeyManager.CreateNew(out _, password, network);

// 5. Create wallet service.
var workDir = Helpers.Common.GetWorkDir();
var workDir = Helpers.Common.GetWorkDir(nameof(BuildTransactionValidationsTestAsync));

using MemoryCache cache = CreateMemoryCache();
await using SpecificNodeBlockProvider specificNodeBlockProvider = new(network, serviceConfiguration, httpClientFactory.TorEndpoint);
Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Tests/RegressionTests/CancelTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public CancelTests(RegTestFixture regTestFixture)
[Fact]
public async Task CancelTestsAsync()
{
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(CancelTestsAsync));
IRPCClient rpc = setup.RpcClient;
Network network = setup.Network;
BitcoinStore bitcoinStore = setup.BitcoinStore;
Expand Down Expand Up @@ -70,7 +70,7 @@ public async Task CancelTestsAsync()
var keyManager = KeyManager.CreateNew(out _, password, network);

// 5. Create wallet service.
var workDir = Common.GetWorkDir();
var workDir = Common.GetWorkDir(nameof(CancelTestsAsync));

using MemoryCache cache = BitcoinFactory.CreateMemoryCache();
await using SpecificNodeBlockProvider specificNodeBlockProvider = new(network, serviceConfiguration, httpClientFactory.TorEndpoint);
Expand Down
2 changes: 1 addition & 1 deletion WalletWasabi.Tests/RegressionTests/FilterDownloaderTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public async Task FilterDownloaderTestAsync()
{
using CancellationTokenSource testDeadlineCts = new(TimeSpan.FromMinutes(5));

await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(FilterDownloaderTestAsync));
IRPCClient rpc = setup.RpcClient;
BitcoinStore bitcoinStore = setup.BitcoinStore;

Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Tests/RegressionTests/MaxFeeTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public MaxFeeTests(RegTestFixture regTestFixture)
[Fact]
public async Task CalculateMaxFeeTestAsync()
{
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(CalculateMaxFeeTestAsync));
IRPCClient rpc = setup.RpcClient;
Network network = setup.Network;
BitcoinStore bitcoinStore = setup.BitcoinStore;
Expand Down Expand Up @@ -70,7 +70,7 @@ public async Task CalculateMaxFeeTestAsync()
var keyManager = KeyManager.CreateNew(out _, password, network);

// 5. Create wallet service.
var workDir = Common.GetWorkDir();
var workDir = Common.GetWorkDir(nameof(CalculateMaxFeeTestAsync));

using MemoryCache cache = BitcoinFactory.CreateMemoryCache();
await using SpecificNodeBlockProvider specificNodeBlockProvider = new(network, serviceConfiguration, httpClientFactory.TorEndpoint);
Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Tests/RegressionTests/ReceiveSpeedupTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public ReceiveSpeedupTests(RegTestFixture regTestFixture)
[Fact]
public async Task ReceiveSpeedupTestsAsync()
{
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(ReceiveSpeedupTestsAsync));
IRPCClient rpc = setup.RpcClient;
Network network = setup.Network;
BitcoinStore bitcoinStore = setup.BitcoinStore;
Expand Down Expand Up @@ -72,7 +72,7 @@ public async Task ReceiveSpeedupTestsAsync()
var keyManager = KeyManager.CreateNew(out _, password, network);

// 5. Create wallet service.
var workDir = Common.GetWorkDir();
var workDir = Common.GetWorkDir(nameof(ReceiveSpeedupTestsAsync));

using MemoryCache cache = BitcoinFactory.CreateMemoryCache();
await using SpecificNodeBlockProvider specificNodeBlockProvider = new(network, serviceConfiguration, httpClientFactory.TorEndpoint);
Expand Down
5 changes: 2 additions & 3 deletions WalletWasabi.Tests/RegressionTests/RegTestSetup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@ public RegTestSetup(RegTestFixture regTestFixture, string dir)
public static async Task<RegTestSetup> InitializeTestEnvironmentAsync(
RegTestFixture regTestFixture,
int numberOfBlocksToGenerate,
[CallerFilePath] string callerFilePath = "",
[CallerMemberName] string callerMemberName = "")
string path)
{
string dir = Helpers.Common.GetWorkDir(callerFilePath, callerMemberName);
string dir = Helpers.Common.GetWorkDir(path);
RegTestSetup setup = new(regTestFixture, dir);

if (numberOfBlocksToGenerate != 0)
Expand Down
2 changes: 1 addition & 1 deletion WalletWasabi.Tests/RegressionTests/ReorgTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public async Task ReorgTestAsync()
{
using CancellationTokenSource testDeadlineCts = new(TimeSpan.FromMinutes(5));

await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(ReorgTestAsync));
IRPCClient rpc = setup.RpcClient;
Network network = setup.Network;
BitcoinStore bitcoinStore = setup.BitcoinStore;
Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Tests/RegressionTests/ReplaceByFeeTxTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public ReplaceByFeeTxTest(RegTestFixture regTestFixture)
[Fact]
public async Task ReplaceByFeeTxTestAsync()
{
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(ReplaceByFeeTxTestAsync));
IRPCClient rpc = setup.RpcClient;
Network network = setup.Network;
BitcoinStore bitcoinStore = setup.BitcoinStore;
Expand All @@ -60,7 +60,7 @@ public async Task ReplaceByFeeTxTestAsync()
var keyManager = KeyManager.CreateNew(out _, password, network);

// 5. Create wallet service.
var workDir = Common.GetWorkDir();
var workDir = Common.GetWorkDir(nameof(ReplaceByFeeTxTestAsync));

await using SpecificNodeBlockProvider specificNodeBlockProvider = new(network, serviceConfiguration, httpClientFactory.TorEndpoint);

Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Tests/RegressionTests/SelfSpendSpeedupTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public SelfSpendSpeedupTests(RegTestFixture regTestFixture)
[Fact]
public async Task SelfSpendSpeedupTestsAsync()
{
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(SelfSpendSpeedupTestsAsync));
IRPCClient rpc = setup.RpcClient;
Network network = setup.Network;
BitcoinStore bitcoinStore = setup.BitcoinStore;
Expand Down Expand Up @@ -72,7 +72,7 @@ public async Task SelfSpendSpeedupTestsAsync()
var keyManager = KeyManager.CreateNew(out _, password, network);

// 5. Create wallet service.
var workDir = Common.GetWorkDir();
var workDir = Common.GetWorkDir(nameof(SelfSpendSpeedupTestsAsync));

using MemoryCache cache = BitcoinFactory.CreateMemoryCache();
await using SpecificNodeBlockProvider specificNodeBlockProvider = new(network, serviceConfiguration, httpClientFactory.TorEndpoint);
Expand Down
4 changes: 2 additions & 2 deletions WalletWasabi.Tests/RegressionTests/SendSpeedupTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public SendSpeedupTests(RegTestFixture regTestFixture)
[Fact]
public async Task SendSpeedupTestsAsync()
{
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1);
await using RegTestSetup setup = await RegTestSetup.InitializeTestEnvironmentAsync(RegTestFixture, numberOfBlocksToGenerate: 1, nameof(SendSpeedupTestsAsync));
IRPCClient rpc = setup.RpcClient;
Network network = setup.Network;
BitcoinStore bitcoinStore = setup.BitcoinStore;
Expand Down Expand Up @@ -68,7 +68,7 @@ public async Task SendSpeedupTestsAsync()
var keyManager = KeyManager.CreateNew(out _, password, network);

// 5. Create wallet service.
var workDir = Common.GetWorkDir();
var workDir = Common.GetWorkDir(nameof(SendSpeedupTestsAsync));

using MemoryCache cache = BitcoinFactory.CreateMemoryCache();
await using SpecificNodeBlockProvider specificNodeBlockProvider = new(network, serviceConfiguration, httpClientFactory.TorEndpoint);
Expand Down

0 comments on commit e1f0e14

Please sign in to comment.