aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-08 15:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Move DeserializePaymentMethodDetails to PaymentType

Browse Source
This commit is contained in:
nicolas.dorier
2019-06-04 09:22:46 +09:00
parent 8ffd182b98
commit b97e083017
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BTCPayServer/Payments/PaymentTypes.Bitcoin.cs
View File

@@ -19,9 +19,14 @@ namespace BTCPayServer.Payments
public override string ToPrettyString() => "On-Chain";
public override string GetId() => "BTCLike";
public override CryptoPaymentData DeserializePaymentData(string cryptoPaymentData)
public override CryptoPaymentData DeserializePaymentData(string str)
{
return JsonConvert.DeserializeObject<BitcoinLikePaymentData>(cryptoPaymentData);
return JsonConvert.DeserializeObject<BitcoinLikePaymentData>(str);
}
public override IPaymentMethodDetails DeserializePaymentMethodDetails(string str)
{
return JsonConvert.DeserializeObject<Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod>(str);
}
}
}

9
BTCPayServer/Payments/PaymentTypes.Lightning.cs
View File

@@ -18,9 +18,14 @@ namespace BTCPayServer.Payments
public override string ToPrettyString() => "Off-Chain";
public override string GetId() => "LightningLike";
public override CryptoPaymentData DeserializePaymentData(string cryptoPaymentData)
public override CryptoPaymentData DeserializePaymentData(string str)
{
return JsonConvert.DeserializeObject<Payments.Lightning.LightningLikePaymentData>(cryptoPaymentData);
return JsonConvert.DeserializeObject<Payments.Lightning.LightningLikePaymentData>(str);
}
public override IPaymentMethodDetails DeserializePaymentMethodDetails(string str)
{
return JsonConvert.DeserializeObject<Payments.Lightning.LightningLikePaymentMethodDetails>(str);
}
}
}

3
BTCPayServer/Payments/PaymentTypes.cs
View File

@@ -55,6 +55,7 @@ namespace BTCPayServer.Payments
}
public abstract string GetId();
public abstract CryptoPaymentData DeserializePaymentData(string cryptoPaymentData);
public abstract CryptoPaymentData DeserializePaymentData(string str);
public abstract IPaymentMethodDetails DeserializePaymentMethodDetails(string str);
}
}

10
BTCPayServer/Services/Invoices/InvoiceEntity.cs
View File

@@ -756,15 +756,7 @@ namespace BTCPayServer.Services.Invoices
else
{
var paymentType = GetId().PaymentType;
IPaymentMethodDetails details = null;
if (paymentType == PaymentTypes.BTCLike)
{
details = JsonConvert.DeserializeObject<Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod>(PaymentMethodDetails.ToString());
}
else
{
details = JsonConvert.DeserializeObject<Payments.Lightning.LightningLikePaymentMethodDetails>(PaymentMethodDetails.ToString());
}
IPaymentMethodDetails details = paymentType.DeserializePaymentMethodDetails(PaymentMethodDetails.ToString());
if (details is Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod btcLike)
{
btcLike.NextNetworkFee = NextNetworkFee;