mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-22 14:22:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove warnings

Browse source
This commit is contained in:
nicolas.dorier 2019-07-04 21:18:16 +09:00
parent 5567a26b33
commit e3db2e2b76
No known key found for this signature in database
GPG key ID: 6618763EF09186FE
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BTCPayServer.Tests/AuthenticationTests.cs
View file

@ -127,11 +127,11 @@ namespace BTCPayServer.Tests
results = url.Split("#").Last().Split("&").ToDictionary(s1 => s1.Split("=")[0], s1 => s1.Split("=")[1]);
await TestApiAgainstAccessToken(results["access_token"], tester, user);
await LogoutFlow(tester, id, s);
LogoutFlow(tester, id, s);
}
}
private async Task LogoutFlow(ServerTester tester, string clientId, SeleniumTester seleniumTester )
void LogoutFlow(ServerTester tester, string clientId, SeleniumTester seleniumTester)
{
var logoutUrl = new Uri(tester.PayTester.ServerUri,
$"connect/logout?response_type=token&client_id={clientId}");
@ -314,7 +314,7 @@ namespace BTCPayServer.Tests
return result.AccessToken;
}
public async Task TestApiAgainstAccessToken(string accessToken, ServerTester tester, TestAccount testAccount)
async Task TestApiAgainstAccessToken(string accessToken, ServerTester tester, TestAccount testAccount)
{
var resultUser =
await TestApiAgainstAccessToken<string>(accessToken, "api/test/me/id",

4
BTCPayServer.Tests/SeleniumTests.cs
View file

@ -86,7 +86,7 @@ namespace BTCPayServer.Tests
}
}
public static void LogIn(SeleniumTester s, string email)
static void LogIn(SeleniumTester s, string email)
{
s.Driver.FindElement(By.Id("Login")).Click();
s.Driver.FindElement(By.Id("Email")).SendKeys(email);
@ -166,7 +166,7 @@ namespace BTCPayServer.Tests
}
}
public static void CreateInvoice(SeleniumTester s, string store)
static void CreateInvoice(SeleniumTester s, string store)
{
s.Driver.FindElement(By.Id("Invoices")).Click();
s.Driver.FindElement(By.Id("CreateNewInvoice")).Click();

1
BTCPayServer/Extensions/OpenIddictExtensions.cs
View file

@ -20,7 +20,6 @@ namespace BTCPayServer
var file = Path.Combine(configuration.GetDataDir(), "rsaparams");
RSACryptoServiceProvider RSA = new RSACryptoServiceProvider(2048);
RsaSecurityKey key = null;
if (File.Exists(file))
{

6
BTCPayServer/Services/HardwareWalletService.cs
View file

@ -38,10 +38,10 @@ namespace BTCPayServer.Services
List<KeyPath> derivations = new List<KeyPath>();
if (network.NBitcoinNetwork.Consensus.SupportSegwit)
{
if (derivation.Redeem?.IsWitness is true ||
derivation.ScriptPubKey.IsWitness) // Native or p2sh segwit
if (derivation.Redeem?.IsScriptType(ScriptType.Witness) is true ||
derivation.ScriptPubKey.IsScriptType(ScriptType.Witness)) // Native or p2sh segwit
derivations.Add(new KeyPath("49'"));
if (derivation.Redeem == null && derivation.ScriptPubKey.IsWitness) // Native segwit
if (derivation.Redeem == null && derivation.ScriptPubKey.IsScriptType(ScriptType.Witness)) // Native segwit
derivations.Add(new KeyPath("84'"));
}
derivations.Add(new KeyPath("44'"));