Csproj cleanup, reorganizing namespaces, fixing tests

This commit is contained in:
rockstardev
2019-10-02 22:41:53 -05:00
parent 755a6bf8e6
commit 56e85b68d9
46 changed files with 70 additions and 72 deletions

View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
namespace BTCPayServer.Altcoins.Monero.RPC
namespace BTCPayServer.Services.Altcoins.Monero.RPC
{
public class JsonRpcClient
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class CreateAccountRequest
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class CreateAccountResponse
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class CreateAddressRequest
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class CreateAddressResponse
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class GetAccountsRequest
{

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class GetAccountsResponse
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public class GetFeeEstimateRequest
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public class GetFeeEstimateResponse
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class GetHeightResponse
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public class GetTransferByTransactionIdRequest
{

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class GetTransferByTransactionIdResponse
{

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class GetTransfersRequest
{

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class GetTransfersResponse
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class Info
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class MakeUriRequest
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class MakeUriResponse
{

View File

@@ -2,7 +2,7 @@ using System;
using System.Globalization;
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
internal class ParseStringConverter : JsonConverter
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class Peer
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class SubaddrIndex
{

View File

@@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class SubaddressAccount
{

View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace BTCPayServer.Altcoins.Monero.RPC.Models
namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
{
public partial class SyncInfoResponse
{

View File

@@ -1,6 +1,6 @@
using System.Globalization;
namespace BTCPayServer.Altcoins.Monero.Utils
namespace BTCPayServer.Services.Altcoins.Monero.Utils
{
public class MoneroMoney
{

View File

@@ -5,19 +5,19 @@
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Build\dockerfiles\**" />
<Compile Remove="Build\**" />
<Compile Remove="wwwroot\bundles\jqueryvalidate\**" />
<Compile Remove="wwwroot\css\**" />
<Compile Remove="wwwroot\vendor\jquery-nice-select\**" />
<Content Remove="Build\dockerfiles\**" />
<Content Remove="Build\**" />
<Content Remove="wwwroot\bundles\jqueryvalidate\**" />
<Content Remove="wwwroot\css\**" />
<Content Remove="wwwroot\vendor\jquery-nice-select\**" />
<EmbeddedResource Remove="Build\dockerfiles\**" />
<EmbeddedResource Remove="Build\**" />
<EmbeddedResource Remove="wwwroot\bundles\jqueryvalidate\**" />
<EmbeddedResource Remove="wwwroot\css\**" />
<EmbeddedResource Remove="wwwroot\vendor\jquery-nice-select\**" />
<None Remove="Build\dockerfiles\**" />
<None Remove="Build\**" />
<None Remove="wwwroot\bundles\jqueryvalidate\**" />
<None Remove="wwwroot\css\**" />
<None Remove="wwwroot\vendor\jquery-nice-select\**" />
@@ -121,7 +121,6 @@
<ItemGroup>
<Folder Include="Authentication\OpenId\Models\" />
<Folder Include="Build\" />
<Folder Include="wwwroot\vendor\clipboard.js\" />
<Folder Include="wwwroot\vendor\highlightjs\" />
<Folder Include="wwwroot\vendor\summernote" />

View File

@@ -1,5 +1,5 @@
using BTCPayServer.Configuration;
using BTCPayServer.Altcoins.Monero;
using BTCPayServer.Services.Altcoins.Monero;
using Microsoft.Extensions.Logging;
using System;
using System.IdentityModel.Tokens.Jwt;

View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Altcoins.Monero.Payments;
using BTCPayServer.Services.Altcoins.Monero.Payments;
using BTCPayServer.Services.Invoices;
using Newtonsoft.Json.Linq;

View File

@@ -10,7 +10,6 @@ using Microsoft.Extensions.Options;
namespace BTCPayServer.Security
{
public class BTCPayClaimsFilter : IAsyncAuthorizationFilter, IConfigureOptions<MvcOptions>
{
UserManager<ApplicationUser> _userManager;

View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace BTCPayServer.Altcoins.Monero.Configuration
namespace BTCPayServer.Services.Altcoins.Monero.Configuration
{
public class MoneroLikeConfiguration
{

View File

@@ -2,14 +2,14 @@ using System;
using System.Linq;
using BTCPayServer.Configuration;
using BTCPayServer.Contracts;
using BTCPayServer.Altcoins.Monero.Configuration;
using BTCPayServer.Altcoins.Monero.Payments;
using BTCPayServer.Altcoins.Monero.Services;
using BTCPayServer.Services.Altcoins.Monero.Configuration;
using BTCPayServer.Services.Altcoins.Monero.Payments;
using BTCPayServer.Services.Altcoins.Monero.Services;
using BTCPayServer.Payments;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
namespace BTCPayServer.Altcoins.Monero
namespace BTCPayServer.Services.Altcoins.Monero
{
public static class MoneroLikeExtensions
{

View File

@@ -1,6 +1,6 @@
using BTCPayServer.Contracts;
namespace BTCPayServer.Altcoins.Monero
namespace BTCPayServer.Services.Altcoins.Monero
{
public class MoneroStoreNavExtension: IStoreNavExtension
{

View File

@@ -1,6 +1,6 @@
using BTCPayServer.Payments;
namespace BTCPayServer.Altcoins.Monero.Payments
namespace BTCPayServer.Services.Altcoins.Monero.Payments
{
public class MoneroLikeOnChainPaymentMethodDetails : IPaymentMethodDetails
{

View File

@@ -1,9 +1,9 @@
using BTCPayServer.Data;
using BTCPayServer.Altcoins.Monero.Utils;
using BTCPayServer.Services.Altcoins.Monero.Utils;
using BTCPayServer.Payments;
using BTCPayServer.Services.Invoices;
namespace BTCPayServer.Altcoins.Monero.Payments
namespace BTCPayServer.Services.Altcoins.Monero.Payments
{
public class MoneroLikePaymentData : CryptoPaymentData
{

View File

@@ -6,16 +6,16 @@ using BTCPayServer.Data;
using BTCPayServer.Lightning;
using BTCPayServer.Models;
using BTCPayServer.Models.InvoicingModels;
using BTCPayServer.Altcoins.Monero.RPC.Models;
using BTCPayServer.Altcoins.Monero.Services;
using BTCPayServer.Altcoins.Monero.Utils;
using BTCPayServer.Services.Altcoins.Monero.RPC.Models;
using BTCPayServer.Services.Altcoins.Monero.Services;
using BTCPayServer.Services.Altcoins.Monero.Utils;
using BTCPayServer.Payments;
using BTCPayServer.Rating;
using BTCPayServer.Services.Invoices;
using BTCPayServer.Services.Rates;
using NBitcoin;
namespace BTCPayServer.Altcoins.Monero.Payments
namespace BTCPayServer.Services.Altcoins.Monero.Payments
{
public class MoneroLikePaymentMethodHandler : PaymentMethodHandlerBase<MoneroSupportedPaymentMethod, MoneroLikeSpecificBtcPayNetwork>
{

View File

@@ -4,7 +4,7 @@ using BTCPayServer.Services.Invoices;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace BTCPayServer.Altcoins.Monero.Payments
namespace BTCPayServer.Services.Altcoins.Monero.Payments
{
public class MoneroPaymentType: PaymentType
{

View File

@@ -1,6 +1,6 @@
using BTCPayServer.Payments;
namespace BTCPayServer.Altcoins.Monero.Payments
namespace BTCPayServer.Services.Altcoins.Monero.Payments
{
public class MoneroSupportedPaymentMethod : ISupportedPaymentMethod
{

View File

@@ -1,7 +1,7 @@
using BTCPayServer.Filters;
using Microsoft.AspNetCore.Mvc;
namespace BTCPayServer.Altcoins.Monero.RPC
namespace BTCPayServer.Services.Altcoins.Monero.RPC
{
[Route("[controller]")]
[OnlyIfSupportAttribute("XMR")]

View File

@@ -1,4 +1,4 @@
namespace BTCPayServer.Altcoins.Monero.RPC
namespace BTCPayServer.Services.Altcoins.Monero.RPC
{
public class MoneroEvent
{

View File

@@ -2,11 +2,11 @@ using System;
using System.Threading;
using System.Threading.Tasks;
using BTCPayServer.Logging;
using BTCPayServer.Altcoins.Monero.Configuration;
using BTCPayServer.Services.Altcoins.Monero.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
namespace BTCPayServer.Altcoins.Monero.Services
namespace BTCPayServer.Services.Altcoins.Monero.Services
{
public class MoneroLikeSummaryUpdaterHostedService: IHostedService
{

View File

@@ -6,10 +6,10 @@ using System.Threading;
using System.Threading.Tasks;
using BTCPayServer.Data;
using BTCPayServer.Events;
using BTCPayServer.Altcoins.Monero.Configuration;
using BTCPayServer.Altcoins.Monero.Payments;
using BTCPayServer.Altcoins.Monero.RPC;
using BTCPayServer.Altcoins.Monero.RPC.Models;
using BTCPayServer.Services.Altcoins.Monero.Configuration;
using BTCPayServer.Services.Altcoins.Monero.Payments;
using BTCPayServer.Services.Altcoins.Monero.RPC;
using BTCPayServer.Services.Altcoins.Monero.RPC.Models;
using BTCPayServer.Payments;
using BTCPayServer.Services.Invoices;
using Microsoft.Extensions.Hosting;
@@ -17,7 +17,7 @@ using Microsoft.Extensions.Logging;
using NBitcoin;
using NBXplorer;
namespace BTCPayServer.Altcoins.Monero.Services
namespace BTCPayServer.Services.Altcoins.Monero.Services
{
public class MoneroListener : IHostedService
{
@@ -231,7 +231,7 @@ namespace BTCPayServer.Altcoins.Monero.Services
public Task StopAsync(CancellationToken cancellationToken)
{
leases.Dispose();
_Cts.Cancel();
_Cts?.Cancel();
return Task.CompletedTask;
}

View File

@@ -3,12 +3,12 @@ using System.Collections.Concurrent;
using System.Collections.Immutable;
using System.Net.Http;
using System.Threading.Tasks;
using BTCPayServer.Altcoins.Monero.Configuration;
using BTCPayServer.Altcoins.Monero.RPC;
using BTCPayServer.Altcoins.Monero.RPC.Models;
using BTCPayServer.Services.Altcoins.Monero.Configuration;
using BTCPayServer.Services.Altcoins.Monero.RPC;
using BTCPayServer.Services.Altcoins.Monero.RPC.Models;
using NBitcoin;
namespace BTCPayServer.Altcoins.Monero.Services
namespace BTCPayServer.Services.Altcoins.Monero.Services
{
public class MoneroRPCProvider
{

View File

@@ -8,10 +8,10 @@ using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Data;
using BTCPayServer.Models;
using BTCPayServer.Altcoins.Monero.Configuration;
using BTCPayServer.Altcoins.Monero.Payments;
using BTCPayServer.Altcoins.Monero.RPC.Models;
using BTCPayServer.Altcoins.Monero.Services;
using BTCPayServer.Services.Altcoins.Monero.Configuration;
using BTCPayServer.Services.Altcoins.Monero.Payments;
using BTCPayServer.Services.Altcoins.Monero.RPC.Models;
using BTCPayServer.Services.Altcoins.Monero.Services;
using BTCPayServer.Payments;
using BTCPayServer.Security;
using BTCPayServer.Services.Stores;
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using BTCPayServer.Filters;
namespace BTCPayServer.Altcoins.Monero.UI
namespace BTCPayServer.Services.Altcoins.Monero.UI
{
[Route("stores/{storeId}/monerolike")]
[OnlyIfSupportAttribute("XMR")]

View File

@@ -1,6 +1,6 @@
using System;
namespace BTCPayServer.Altcoins.Monero.UI
namespace BTCPayServer.Services.Altcoins.Monero.UI
{
public class MoneroPaymentViewModel
{

View File

@@ -1,6 +1,6 @@
@using BTCPayServer.Controllers
@using BTCPayServer.Views.Stores
@model BTCPayServer.Altcoins.Monero.UI.MoneroLikeStoreController.MoneroLikePaymentMethodViewModel
@model BTCPayServer.Services.Altcoins.Monero.UI.MoneroLikeStoreController.MoneroLikePaymentMethodViewModel
@{
Layout = "../Shared/_NavLayout.cshtml";

View File

@@ -1,5 +1,5 @@
@using BTCPayServer.Views.Stores
@model BTCPayServer.Altcoins.Monero.UI.MoneroLikeStoreController.MoneroLikePaymentMethodListViewModel
@model BTCPayServer.Services.Altcoins.Monero.UI.MoneroLikeStoreController.MoneroLikePaymentMethodListViewModel
@{
Layout = "../Shared/_NavLayout.cshtml";

View File

@@ -1,6 +1,6 @@
@using BTCPayServer.Controllers
@using BTCPayServer.Altcoins.Monero.Configuration
@using BTCPayServer.Altcoins.Monero.UI
@using BTCPayServer.Services.Altcoins.Monero.Configuration
@using BTCPayServer.Services.Altcoins.Monero.UI
@inject SignInManager<ApplicationUser> SignInManager;
@inject MoneroLikeConfiguration MoneroLikeConfiguration;
@{

View File

@@ -1,7 +1,7 @@
@using System.Globalization
@using BTCPayServer.Controllers
@using BTCPayServer.Altcoins.Monero.Payments
@using BTCPayServer.Altcoins.Monero.UI
@using BTCPayServer.Services.Altcoins.Monero.Payments
@using BTCPayServer.Services.Altcoins.Monero.UI
@model IEnumerable<BTCPayServer.Services.Invoices.PaymentEntity>
@{