Renaming to LndServiceViewModel, used both by grpc and rest

This commit is contained in:
rockstardev 2019-11-03 13:18:09 -06:00
parent bf59114a00
commit a126ec1718
4 changed files with 7 additions and 22 deletions

View file

@ -491,6 +491,8 @@ namespace BTCPayServer.Controllers
{
var result = new ServicesViewModel();
result.ExternalServices = _Options.ExternalServices.ToList();
// other services
foreach (var externalService in _Options.OtherExternalServices)
{
result.OtherExternalServices.Add(new ServicesViewModel.OtherExternalService()
@ -536,6 +538,7 @@ namespace BTCPayServer.Controllers
}
}
// external storage services
var storageSettings = await _SettingsRepository.GetSettingAsync<StorageSettings>();
result.ExternalStorageServices.Add(new ServicesViewModel.OtherExternalService()
{
@ -647,7 +650,7 @@ namespace BTCPayServer.Controllers
private IActionResult LndServices(ExternalService service, ExternalConnectionString connectionString, uint? nonce)
{
var model = new LndGrpcServicesViewModel();
var model = new LndServicesViewModel();
if (service.Type == ExternalServiceTypes.LNDGRPC)
{
model.Host = $"{connectionString.Server.DnsSafeHost}:{connectionString.Server.Port}";

View file

@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace BTCPayServer.Models.ServerViewModels
{
public class LndRestServicesViewModel
{
public string BaseApiUrl { get; set; }
public string Macaroon { get; set; }
public string CertificateThumbprint { get; set; }
}
}

View file

@ -1,12 +1,8 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
using System.ComponentModel.DataAnnotations;
namespace BTCPayServer.Models.ServerViewModels
{
public class LndGrpcServicesViewModel
public class LndServicesViewModel
{
public string Host { get; set; }
public bool SSL { get; set; }

View file

@ -1,4 +1,4 @@
@model LndGrpcServicesViewModel
@model LndServicesViewModel
@{
ViewData.SetActivePageAndTitle(ServerNavPages.Services);
}