aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 14:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix flaky test (#2392)

Browse Source
This commit is contained in:
Nicolas Dorier
2021-03-24 21:33:49 +09:00
committed by GitHub
parent ceb541ad8a
commit fd53f7476e
3 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
BTCPayServer.Tests/PayJoinTests.cs
View File

@@ -378,19 +378,14 @@ namespace BTCPayServer.Tests
await alice.RegisterDerivationSchemeAsync("BTC", ScriptPubKeyType.Segwit, true); await alice.RegisterDerivationSchemeAsync("BTC", ScriptPubKeyType.Segwit, true);
await notifications.ListenDerivationSchemesAsync(new[] { alice.DerivationScheme }); await notifications.ListenDerivationSchemesAsync(new[] { alice.DerivationScheme });
BitcoinAddress aliceAddress = null; BitcoinAddress address = null;
for (int i = 0; i < 3; i++) for (int i = 0; i < 5; i++)
{ {
await tester.WaitForEvent<NewOnChainTransactionEvent>(async () => address = (await nbx.GetUnusedAsync(alice.DerivationScheme, DerivationFeature.Deposit)).Address;
{
aliceAddress = (await nbx.GetUnusedAsync(alice.DerivationScheme, DerivationFeature.Deposit)).Address;
await tester.ExplorerNode.GenerateAsync(1); await tester.ExplorerNode.GenerateAsync(1);
tester.ExplorerNode.SendToAddress(aliceAddress, Money.Coins(1.0m)); tester.ExplorerNode.SendToAddress(address, Money.Coins(1.0m));
});
}
await notifications.NextEventAsync(); await notifications.NextEventAsync();
}
var paymentAddress = new Key().PubKey.GetAddress(ScriptPubKeyType.Legacy, Network.RegTest); var paymentAddress = new Key().PubKey.GetAddress(ScriptPubKeyType.Legacy, Network.RegTest);
var otherAddress = new Key().PubKey.GetAddress(ScriptPubKeyType.Legacy, Network.RegTest); var otherAddress = new Key().PubKey.GetAddress(ScriptPubKeyType.Legacy, Network.RegTest);
var psbt = (await nbx.CreatePSBTAsync(alice.DerivationScheme, new CreatePSBTRequest() var psbt = (await nbx.CreatePSBTAsync(alice.DerivationScheme, new CreatePSBTRequest()
@@ -457,7 +452,6 @@ namespace BTCPayServer.Tests
fakeServer.Done(); fakeServer.Done();
ex = await Assert.ThrowsAsync<PayjoinSenderException>(async () => await requesting); ex = await Assert.ThrowsAsync<PayjoinSenderException>(async () => await requesting);
Assert.Contains("The receiver decreased the value of one", ex.Message); Assert.Contains("The receiver decreased the value of one", ex.Message);
Logs.Tester.LogInformation("The payjoin receiver tries to pocket the fee"); Logs.Tester.LogInformation("The payjoin receiver tries to pocket the fee");
requesting = pjClient.RequestPayjoin(bip21, new PayjoinWallet(derivationSchemeSettings), psbt, default); requesting = pjClient.RequestPayjoin(bip21, new PayjoinWallet(derivationSchemeSettings), psbt, default);
request = await fakeServer.GetNextRequest(); request = await fakeServer.GetNextRequest();
@@ -505,7 +499,6 @@ namespace BTCPayServer.Tests
ex = await Assert.ThrowsAsync<PayjoinSenderException>(async () => await requesting); ex = await Assert.ThrowsAsync<PayjoinSenderException>(async () => await requesting);
Assert.Contains("is not only paying fee", ex.Message); Assert.Contains("is not only paying fee", ex.Message);
pjClient.MaxFeeBumpContribution = null; pjClient.MaxFeeBumpContribution = null;
Logs.Tester.LogInformation("The payjoin receiver can't use additional fee without adding inputs"); Logs.Tester.LogInformation("The payjoin receiver can't use additional fee without adding inputs");
pjClient.MinimumFeeRate = new FeeRate(50m); pjClient.MinimumFeeRate = new FeeRate(50m);
requesting = pjClient.RequestPayjoin(bip21, new PayjoinWallet(derivationSchemeSettings), psbt, default); requesting = pjClient.RequestPayjoin(bip21, new PayjoinWallet(derivationSchemeSettings), psbt, default);
@@ -523,15 +516,19 @@ namespace BTCPayServer.Tests
var bob = tester.NewAccount(); var bob = tester.NewAccount();
await bob.GrantAccessAsync(); await bob.GrantAccessAsync();
await bob.RegisterDerivationSchemeAsync("BTC", ScriptPubKeyType.Segwit, true); await bob.RegisterDerivationSchemeAsync("BTC", ScriptPubKeyType.Segwit, true);
await notifications.DisposeAsync();
notifications = await nbx.CreateWebsocketNotificationSessionAsync();
await notifications.ListenDerivationSchemesAsync(new[] { bob.DerivationScheme }); await notifications.ListenDerivationSchemesAsync(new[] { bob.DerivationScheme });
aliceAddress = (await nbx.GetUnusedAsync(bob.DerivationScheme, DerivationFeature.Deposit)).Address; address = (await nbx.GetUnusedAsync(bob.DerivationScheme, DerivationFeature.Deposit)).Address;
tester.ExplorerNode.SendToAddress(aliceAddress, Money.Coins(1.1m)); tester.ExplorerNode.SendToAddress(address, Money.Coins(1.1m));
await notifications.NextEventAsync(); await notifications.NextEventAsync();
bob.ModifyStore(s => s.PayJoinEnabled = true); bob.ModifyStore(s => s.PayJoinEnabled = true);
var invoice = bob.BitPay.CreateInvoice( var invoice = bob.BitPay.CreateInvoice(
new Invoice() { Price = 0.1m, Currency = "BTC", FullNotifications = true }); new Invoice() { Price = 0.1m, Currency = "BTC", FullNotifications = true });
var invoiceBIP21 = new BitcoinUrlBuilder(invoice.CryptoInfo.First().PaymentUrls.BIP21, var invoiceBIP21 = new BitcoinUrlBuilder(invoice.CryptoInfo.First().PaymentUrls.BIP21,
tester.ExplorerClient.Network.NBitcoinNetwork); tester.ExplorerClient.Network.NBitcoinNetwork);
psbt = (await nbx.CreatePSBTAsync(alice.DerivationScheme, new CreatePSBTRequest() psbt = (await nbx.CreatePSBTAsync(alice.DerivationScheme, new CreatePSBTRequest()
{ {
Destinations = Destinations =
@@ -823,16 +820,32 @@ retry:
//give the cow some cash //give the cow some cash
await cashCow.GenerateAsync(1); await cashCow.GenerateAsync(1);
//let's get some more utxos first //let's get some more utxos first
await receiverUser.ReceiveUTXO(Money.Coins(0.011m), btcPayNetwork); foreach (var m in new []
await receiverUser.ReceiveUTXO(Money.Coins(0.012m), btcPayNetwork); {
await receiverUser.ReceiveUTXO(Money.Coins(0.013m), btcPayNetwork); Money.Coins(0.011m),
await receiverUser.ReceiveUTXO(Money.Coins(0.014m), btcPayNetwork); Money.Coins(0.012m),
await senderUser.ReceiveUTXO(Money.Coins(0.021m), btcPayNetwork); Money.Coins(0.013m),
await senderUser.ReceiveUTXO(Money.Coins(0.022m), btcPayNetwork); Money.Coins(0.014m),
await senderUser.ReceiveUTXO(Money.Coins(0.023m), btcPayNetwork); Money.Coins(0.015m),
await senderUser.ReceiveUTXO(Money.Coins(0.024m), btcPayNetwork); Money.Coins(0.016m)
await senderUser.ReceiveUTXO(Money.Coins(0.025m), btcPayNetwork); })
await senderUser.ReceiveUTXO(Money.Coins(0.026m), btcPayNetwork); {
await receiverUser.ReceiveUTXO(m, btcPayNetwork);
}
foreach (var m in new[]
{
Money.Coins(0.021m),
Money.Coins(0.022m),
Money.Coins(0.023m),
Money.Coins(0.024m),
Money.Coins(0.025m),
Money.Coins(0.026m)
})
{
await senderUser.ReceiveUTXO(m, btcPayNetwork);
}
var senderChange = await senderUser.GetNewAddress(btcPayNetwork); var senderChange = await senderUser.GetNewAddress(btcPayNetwork);
//Let's start the harassment //Let's start the harassment
@@ -873,7 +886,7 @@ retry:
{ {
senderCoins = await btcPayWallet.GetUnspentCoins(senderUser.DerivationScheme); senderCoins = await btcPayWallet.GetUnspentCoins(senderUser.DerivationScheme);
Assert.Contains(senderCoins, coin => coin.Value.GetValue(btcPayNetwork) == 0.026m); Assert.Contains(senderCoins, coin => coin.Value.GetValue(btcPayNetwork) == 0.026m);
coin = senderCoins.Single(coin => coin.Value.GetValue(btcPayNetwork) == 0.021m); coin = Assert.Single(senderCoins, coin => coin.Value.GetValue(btcPayNetwork) == 0.021m);
coin2 = Assert.Single(senderCoins, coin => coin.Value.GetValue(btcPayNetwork) == 0.022m); coin2 = Assert.Single(senderCoins, coin => coin.Value.GetValue(btcPayNetwork) == 0.022m);
coin3 = Assert.Single(senderCoins, coin => coin.Value.GetValue(btcPayNetwork) == 0.023m); coin3 = Assert.Single(senderCoins, coin => coin.Value.GetValue(btcPayNetwork) == 0.023m);
coin4 = Assert.Single(senderCoins, coin => coin.Value.GetValue(btcPayNetwork) == 0.024m); coin4 = Assert.Single(senderCoins, coin => coin.Value.GetValue(btcPayNetwork) == 0.024m);

4
BTCPayServer.Tests/TestAccount.cs
View File

@@ -173,7 +173,7 @@ namespace BTCPayServer.Tests
} }
public async Task<WalletId> RegisterDerivationSchemeAsync(string cryptoCode, ScriptPubKeyType segwit = ScriptPubKeyType.Legacy, public async Task<WalletId> RegisterDerivationSchemeAsync(string cryptoCode, ScriptPubKeyType segwit = ScriptPubKeyType.Legacy,
bool importKeysToNBX = false) bool importKeysToNBX = false, bool importsKeysToBitcoinCore = false)
{ {
if (StoreId is null) if (StoreId is null)
await CreateStoreAsync(); await CreateStoreAsync();
@@ -183,7 +183,7 @@ namespace BTCPayServer.Tests
{ {
ScriptPubKeyType = segwit, ScriptPubKeyType = segwit,
SavePrivateKeys = importKeysToNBX, SavePrivateKeys = importKeysToNBX,
ImportKeysToRPC = importKeysToNBX ImportKeysToRPC = importsKeysToBitcoinCore
}); });
await store.UpdateWallet( await store.UpdateWallet(
new WalletSetupViewModel new WalletSetupViewModel

2
BTCPayServer/Controllers/GreenField/StoreOnChainWalletsController.cs
View File

@@ -286,7 +286,7 @@ namespace BTCPayServer.Controllers.GreenField
{ {
address = BitcoinAddress.Create(destination.Destination, network.NBitcoinNetwork).ToString(); address = BitcoinAddress.Create(destination.Destination, network.NBitcoinNetwork).ToString();
} }
catch (Exception e) catch (Exception)
{ {
request.AddModelError(transactionRequest => transactionRequest.Destinations[index], request.AddModelError(transactionRequest => transactionRequest.Destinations[index],
"Destination must be a BIP21 payment link or an address", this); "Destination must be a BIP21 payment link or an address", this);