Skip to content

Commit 59905ac

Browse files
napolynapoly
committed
Add unhappy scenario integration test with razor and context fixes
1 parent cdfdb2c commit 59905ac

8 files changed

Lines changed: 160 additions & 19 deletions

File tree

‎.github/workflows/dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: dotnet clean
3232

3333
- name: Build projects
34-
run: dotnet build -c Release --no-restore
34+
run: dotnet build -maxcpucount:1 -c Release --no-restore
3535

3636
- name: Deterministic build check
3737
run: |

‎BTCPayServer.Plugins.IntegrationTests/BTCPayServer.Plugins.IntegrationTests.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
12-
<PackageReference Include="Microsoft.Playwright" Version="1.52.0"/>
13-
<PackageReference Include="xunit" Version="2.9.3"/>
11+
<PackageReference Include="Docker.DotNet" Version="3.125.15" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
13+
<PackageReference Include="Microsoft.Playwright" Version="1.52.0" />
14+
<PackageReference Include="xunit" Version="2.9.3" />
1415
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
1516
<PrivateAssets>all</PrivateAssets>
1617
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -26,8 +27,8 @@
2627
</ItemGroup>
2728

2829
<ItemGroup>
29-
<ProjectReference Include="..\submodules\btcpayserver\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj"/>
30-
<ProjectReference Include="..\submodules\btcpayserver\BTCPayServer.Tests\BTCPayServer.Tests.csproj"/>
30+
<ProjectReference Include="..\submodules\btcpayserver\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj" />
31+
<ProjectReference Include="..\submodules\btcpayserver\BTCPayServer.Tests\BTCPayServer.Tests.csproj" />
3132
<ProjectReference Include="..\Plugins\Monero\BTCPayServer.Plugins.Monero.csproj" />
3233
</ItemGroup>
3334

‎BTCPayServer.Plugins.IntegrationTests/Monero/MoneroPluginIntegrationTest.cs‎

Lines changed: 99 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,59 @@
1+
using System.Diagnostics;
2+
3+
using BTCPayServer.Plugins.Monero.Services;
14
using BTCPayServer.Rating;
25
using BTCPayServer.Services.Rates;
6+
using BTCPayServer.Tests;
37
using BTCPayServer.Tests.Mocks;
48

59
using Xunit;
610
using Xunit.Abstractions;
711

812
namespace BTCPayServer.Plugins.IntegrationTests.Monero;
913

10-
public class MoneroPluginIntegrationTest(ITestOutputHelper helper) : MoneroAndBitcoinIntegrationTestBase(helper)
14+
public class MoneroPluginIntegrationTest(ITestOutputHelper helper) : MoneroAndBitcoinIntegrationTestBase(helper), IAsyncLifetime
1115
{
16+
public Task InitializeAsync() => Task.CompletedTask;
17+
18+
public async Task DisposeAsync()
19+
{
20+
try
21+
{
22+
var removeWalletFromDocker = new ProcessStartInfo
23+
{
24+
FileName = "docker",
25+
Arguments = "exec xmr_wallet sh -c \"rm -rf /wallet/*\"",
26+
RedirectStandardOutput = true,
27+
RedirectStandardError = true
28+
};
29+
30+
using var process = Process.Start(removeWalletFromDocker);
31+
if (process is null)
32+
{
33+
return;
34+
}
35+
36+
var stdout = await process.StandardOutput.ReadToEndAsync();
37+
var stderr = await process.StandardError.ReadToEndAsync();
38+
39+
await process.WaitForExitAsync();
40+
41+
if (!string.IsNullOrWhiteSpace(stdout))
42+
{
43+
Console.WriteLine(stdout);
44+
}
45+
46+
if (!string.IsNullOrWhiteSpace(stderr))
47+
{
48+
Console.WriteLine(stderr);
49+
}
50+
}
51+
catch (Exception ex)
52+
{
53+
Console.WriteLine($"Cleanup failed: {ex}");
54+
}
55+
}
56+
1257
[Fact]
1358
public async Task EnableMoneroPluginSuccessfully()
1459
{
@@ -36,20 +81,24 @@ public async Task EnableMoneroPluginSuccessfully()
3681
await s.RegisterNewUser(true);
3782
await s.CreateNewStore(preferredExchange: "Kraken");
3883
await s.Page.Locator("a.nav-link[href*='monerolike/XMR']").ClickAsync();
39-
await s.Page.Locator("input#PrimaryAddress").FillAsync("43Pnj6ZKGFTJhaLhiecSFfLfr64KPJZw7MyGH73T6PTDekBBvsTAaWEUSM4bmJqDuYLizhA13jQkMRPpz9VXBCBqQQb6y5L");
40-
await s.Page.Locator("input#PrivateViewKey").FillAsync("1bfa03b0c78aa6bc8292cf160ec9875657d61e889c41d0ebe5c54fd3a2c4b40e");
84+
await s.Page.Locator("input#PrimaryAddress")
85+
.FillAsync("43Pnj6ZKGFTJhaLhiecSFfLfr64KPJZw7MyGH73T6PTDekBBvsTAaWEUSM4bmJqDuYLizhA13jQkMRPpz9VXBCBqQQb6y5L");
86+
await s.Page.Locator("input#PrivateViewKey")
87+
.FillAsync("1bfa03b0c78aa6bc8292cf160ec9875657d61e889c41d0ebe5c54fd3a2c4b40e");
4188
await s.Page.Locator("input#RestoreHeight").FillAsync("0");
4289
await s.Page.Locator("input#WalletPassword").FillAsync("pass123");
4390
await s.Page.ClickAsync("button[name='command'][value='set-wallet-details']");
4491
await s.Page.CheckAsync("#Enabled");
4592
await s.Page.SelectOptionAsync("#SettlementConfirmationThresholdChoice", "2");
4693
await s.Page.ClickAsync("#SaveButton");
47-
var classList = await s.Page.Locator("svg.icon-checkmark").GetAttributeAsync("class");
94+
var classList = await s.Page
95+
.Locator("svg.icon-checkmark")
96+
.GetAttributeAsync("class");
4897
Assert.Contains("text-success", classList);
4998

5099
// Set rate provider
51-
await s.Page.Locator("#StoreNav-General").ClickAsync();
52-
await s.Page.Locator("#mainNav #StoreNav-Rates").ClickAsync();
100+
await s.Page.Locator("#menu-item-General").ClickAsync();
101+
await s.Page.Locator("#menu-item-Rates").ClickAsync();
53102
await s.Page.FillAsync("#DefaultCurrencyPairs", "BTC_USD,XMR_USD,XMR_BTC");
54103
await s.Page.SelectOptionAsync("#PrimarySource_PreferredExchange", "kraken");
55104
await s.Page.Locator("#page-primary").ClickAsync();
@@ -69,7 +118,9 @@ public async Task EnableMoneroPluginSuccessfully()
69118
await s.Page.ClickAsync("#DetailsToggle");
70119

71120
// Verify the total fiat amount is $4.20
72-
var totalFiat = await s.Page.Locator("#PaymentDetails-TotalFiat dd.clipboard-button").InnerTextAsync();
121+
var totalFiat = await s.Page
122+
.Locator("#PaymentDetails-TotalFiat dd.clipboard-button")
123+
.InnerTextAsync();
73124
Assert.Equal("$4.20", totalFiat);
74125

75126
await s.Page.GoBackAsync();
@@ -92,5 +143,46 @@ public async Task EnableMoneroPluginSuccessfully()
92143
// Select confirmation time to 0
93144
await s.Page.SelectOptionAsync("#SettlementConfirmationThresholdChoice", "3");
94145
await s.Page.ClickAsync("#SaveButton");
146+
147+
await CleanUp(s);
148+
}
149+
150+
[Fact]
151+
public async Task ShouldFailWhenWrongPrimaryAddress()
152+
{
153+
await using var s = CreatePlaywrightTester();
154+
await s.StartAsync();
155+
156+
await s.RegisterNewUser(true);
157+
await s.CreateNewStore();
158+
await s.Page.Locator("a.nav-link[href*='monerolike/XMR']").ClickAsync();
159+
await s.Page.Locator("input#PrimaryAddress")
160+
.FillAsync("wrongprimaryaddressfSF6ZKGFT7MyGH73T6PTDekBBvsTAaWEUSM4bmJqDuYLizhA13jQkMRPpz9VXBCBqQQb6y5L");
161+
await s.Page.Locator("input#PrivateViewKey")
162+
.FillAsync("1bfa03b0c78aa6bc8292cf160ec9875657d61e889c41d0ebe5c54fd3a2c4b40e");
163+
await s.Page.Locator("input#RestoreHeight").FillAsync("0");
164+
await s.Page.Locator("input#WalletPassword").FillAsync("pass123");
165+
await s.Page.ClickAsync("button[name='command'][value='set-wallet-details']");
166+
var errorText = await s.Page
167+
.Locator("div.validation-summary-errors li")
168+
.InnerTextAsync();
169+
170+
Assert.Equal("Could not generate view wallet from keys: Failed to parse public address", errorText);
171+
172+
await CleanUp(s);
173+
}
174+
175+
private static async Task CleanUp(PlaywrightTester playwrightTester)
176+
{
177+
MoneroRPCProvider moneroRpcProvider = playwrightTester.Server.PayTester.GetService<MoneroRPCProvider>();
178+
if (moneroRpcProvider.IsAvailable("XMR"))
179+
{
180+
await moneroRpcProvider.CloseWallet("XMR");
181+
await moneroRpcProvider.UpdateSummary("XMR");
182+
}
183+
if (playwrightTester.Server.PayTester.InContainer)
184+
{
185+
moneroRpcProvider.DeleteWallet();
186+
}
95187
}
96188
}

‎BTCPayServer.Plugins.IntegrationTests/docker-compose.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ services:
2222
- "tests:127.0.0.1"
2323
volumes:
2424
- ../coverage:/coverage
25+
- xmr_wallet:/wallet
2526

2627
# The dev container is not used, it is just handy to run `docker-compose up dev` to start all services
2728
dev:
@@ -89,7 +90,7 @@ services:
8990
- "bitcoin_datadir:/data"
9091

9192
monerod:
92-
image: btcpayserver/monero:0.18.4.2
93+
image: btcpayserver/monero:0.18.4.3
9394
restart: unless-stopped
9495
container_name: monerod
9596
command: monerod --fixed-difficulty 1 --log-level=2 --rpc-bind-ip=0.0.0.0 --confirm-external-bind --rpc-bind-port=18081 --block-notify="/bin/sh ./scripts/notifier.sh -k -X GET https://host.docker.internal:14142/monerolikedaemoncallback/block?cryptoCode=xmr&hash=%s" --regtest --no-igd --hide-my-port --offline --non-interactive
@@ -99,7 +100,7 @@ services:
99100
- "18081:18081"
100101

101102
xmr_wallet:
102-
image: btcpayserver/monero:0.18.4.2
103+
image: btcpayserver/monero:0.18.4.3
103104
restart: unless-stopped
104105
container_name: xmr_wallet
105106
command: monero-wallet-rpc --log-level 2 --allow-mismatched-daemon-version --rpc-bind-ip=0.0.0.0 --disable-rpc-login --confirm-external-bind --rpc-bind-port=18082 --non-interactive --trusted-daemon --daemon-address=monerod:18081 --wallet-dir=/wallet --tx-notify="/bin/sh ./scripts/notifier.sh -k -X GET https://host.docker.internal:14142/monerolikedaemoncallback/tx?cryptoCode=xmr&hash=%s"

‎Plugins/Monero/BTCPayServer.Plugins.Monero.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@
3939
<!-- Deterministic build -->
4040
<ItemGroup>
4141
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25" PrivateAssets="All"/>
42-
<PackageReference Include="DotNet.ReproducibleBuilds.Isolated" Version="1.2.25" />
43-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
4442
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
45-
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
4643
</ItemGroup>
4744

4845
<!-- If you need Entity Framework, you can uncomment this. This will make it usable in your project without publishing assemblies

‎Plugins/Monero/Services/MoneroRPCProvider.cs‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Concurrent;
33
using System.Collections.Immutable;
4+
using System.IO;
45
using System.Net.Http;
56
using System.Threading.Tasks;
67

@@ -52,6 +53,49 @@ private bool IsAvailable(MoneroLikeSummary summary)
5253
summary.WalletAvailable;
5354
}
5455

56+
public async Task CloseWallet(string cryptoCode)
57+
{
58+
if (!WalletRpcClients.TryGetValue(cryptoCode.ToUpperInvariant(), out var walletRpcClient))
59+
{
60+
throw new InvalidOperationException($"Wallet RPC client not found for {cryptoCode}");
61+
}
62+
63+
await walletRpcClient.SendCommandAsync<JsonRpcClient.NoRequestModel, object>(
64+
"close_wallet", JsonRpcClient.NoRequestModel.Instance);
65+
}
66+
67+
public void DeleteWallet()
68+
{
69+
if (!_moneroLikeConfiguration.MoneroLikeConfigurationItems.TryGetValue("XMR", out var configItem) ||
70+
string.IsNullOrEmpty(configItem.WalletDirectory))
71+
{
72+
return;
73+
}
74+
try
75+
{
76+
var walletFile = Path.Combine(configItem.WalletDirectory, "view_wallet");
77+
var keysFile = walletFile + ".keys";
78+
var passwordFile = Path.Combine(configItem.WalletDirectory, "password");
79+
80+
if (File.Exists(walletFile))
81+
{
82+
File.Delete(walletFile);
83+
}
84+
if (File.Exists(keysFile))
85+
{
86+
File.Delete(keysFile);
87+
}
88+
if (File.Exists(passwordFile))
89+
{
90+
File.Delete(passwordFile);
91+
}
92+
}
93+
catch
94+
{
95+
// ignored
96+
}
97+
}
98+
5599
public async Task<MoneroLikeSummary> UpdateSummary(string cryptoCode)
56100
{
57101
if (!DaemonRpcClients.TryGetValue(cryptoCode.ToUpperInvariant(), out var daemonRpcClient) ||

‎global.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "8.0.416",
4+
"rollForward": "latestFeature"
5+
}
6+
}

‎submodules/btcpayserver‎

Submodule btcpayserver updated 545 files

0 commit comments

Comments
 (0)