Fix build and test

This commit is contained in:
Dennis Reimann 2024-06-28 10:48:23 +02:00
parent 61722fa099
commit 7622aba453
No known key found for this signature in database
GPG Key ID: 5009E1797F03F8D0
3 changed files with 30 additions and 14 deletions

View File

@ -1,10 +1,11 @@
#nullable enable
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json.Linq;
namespace BTCPayServer.Abstractions.Converters;
public class PosDataParser
public static class PosDataParser
{
public static Dictionary<string, object> ParsePosData(JToken? posData)
{

View File

@ -3,15 +3,14 @@ using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection.Metadata;
using System.Runtime.CompilerServices;
using System.Security;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using BTCPayServer.Abstractions.Converters;
using BTCPayServer.Abstractions.Extensions;
using BTCPayServer.Abstractions.Models;
using BTCPayServer.Client;
using BTCPayServer.Client.Models;
using BTCPayServer.Configuration;
@ -20,30 +19,21 @@ using BTCPayServer.Data;
using BTCPayServer.HostedServices;
using BTCPayServer.Hosting;
using BTCPayServer.JsonConverters;
using BTCPayServer.Logging;
using BTCPayServer.Payments;
using BTCPayServer.Payments.Bitcoin;
using BTCPayServer.Payments.Lightning;
using BTCPayServer.Plugins;
using BTCPayServer.Plugins.Bitcoin;
using BTCPayServer.Rating;
using BTCPayServer.Services;
using BTCPayServer.Services.Apps;
using BTCPayServer.Services.Fees;
using BTCPayServer.Services.Invoices;
using BTCPayServer.Services.Labels;
using BTCPayServer.Services.Rates;
using BTCPayServer.Services.Stores;
using BTCPayServer.Validation;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Memory;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using NBitcoin;
using NBitcoin.DataEncoders;
using NBitcoin.Scripting.Parser;
using NBXplorer;
using NBXplorer.DerivationStrategy;
using NBXplorer.Models;
using Newtonsoft.Json;
@ -51,7 +41,6 @@ using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
using Xunit;
using Xunit.Abstractions;
using StoreData = BTCPayServer.Data.StoreData;
namespace BTCPayServer.Tests
{
@ -1628,7 +1617,7 @@ bc1qfzu57kgu5jthl934f9xrdzzx8mmemx7gn07tf0grnvz504j6kzusu2v0ku
testCases.ForEach(tuple =>
{
Assert.Equal(tuple.expectedOutput, UIInvoiceController.PosDataParser.ParsePosData(string.IsNullOrEmpty(tuple.input) ? null : JToken.Parse(tuple.input)));
Assert.Equal(tuple.expectedOutput, PosDataParser.ParsePosData(string.IsNullOrEmpty(tuple.input) ? null : JToken.Parse(tuple.input)));
});
}
[Fact]

View File

@ -32,6 +32,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer.Abstractions",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer.PluginPacker", "BTCPayServer.PluginPacker\BTCPayServer.PluginPacker.csproj", "{7DC94B25-1CFC-4170-AA41-7BA983E4C0B8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BTCPayApp.CommonServer", "BTCPayApp.CommonServer\BTCPayApp.CommonServer.csproj", "{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Altcoins-Debug|Any CPU = Altcoins-Debug|Any CPU
@ -240,6 +242,30 @@ Global
{7DC94B25-1CFC-4170-AA41-7BA983E4C0B8}.Release|x64.Build.0 = Release|Any CPU
{7DC94B25-1CFC-4170-AA41-7BA983E4C0B8}.Release|x86.ActiveCfg = Release|Any CPU
{7DC94B25-1CFC-4170-AA41-7BA983E4C0B8}.Release|x86.Build.0 = Release|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Debug|Any CPU.Build.0 = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Debug|x64.ActiveCfg = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Debug|x64.Build.0 = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Debug|x86.ActiveCfg = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Debug|x86.Build.0 = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Release|Any CPU.ActiveCfg = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Release|Any CPU.Build.0 = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Release|x64.ActiveCfg = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Release|x64.Build.0 = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Release|x86.ActiveCfg = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Altcoins-Release|x86.Build.0 = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Debug|x64.ActiveCfg = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Debug|x64.Build.0 = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Debug|x86.ActiveCfg = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Debug|x86.Build.0 = Debug|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Release|Any CPU.Build.0 = Release|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Release|x64.ActiveCfg = Release|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Release|x64.Build.0 = Release|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Release|x86.ActiveCfg = Release|Any CPU
{F204A9E1-52D8-4B67-BE53-5C6B589B64A0}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE