Refactoring: Move checking condition up

This commit is contained in:
Dennis Reimann 2021-02-18 15:58:35 +01:00
parent 2e2c9764f3
commit 70a21c5136
No known key found for this signature in database
GPG key ID: 5009E1797F03F8D0

View file

@ -110,11 +110,9 @@ namespace BTCPayServer.Controllers
return View(vm.ViewName, vm); return View(vm.ViewName, vm);
} }
} }
else else if (!string.IsNullOrEmpty(vm.DerivationScheme))
{ {
try try
{
if (!string.IsNullOrEmpty(vm.DerivationScheme))
{ {
var newStrategy = ParseDerivationStrategy(vm.DerivationScheme, null, network); var newStrategy = ParseDerivationStrategy(vm.DerivationScheme, null, network);
if (newStrategy.AccountDerivation != strategy?.AccountDerivation) if (newStrategy.AccountDerivation != strategy?.AccountDerivation)
@ -142,18 +140,17 @@ namespace BTCPayServer.Controllers
vm.DerivationScheme = strategy.AccountDerivation.ToString(); vm.DerivationScheme = strategy.AccountDerivation.ToString();
} }
} }
else
{
ModelState.AddModelError(nameof(vm.DerivationScheme), "Please provide your extended public key");
return View(vm.ViewName, vm);
}
}
catch catch
{ {
ModelState.AddModelError(nameof(vm.DerivationScheme), "Invalid wallet format"); ModelState.AddModelError(nameof(vm.DerivationScheme), "Invalid wallet format");
return View(vm.ViewName, vm); return View(vm.ViewName, vm);
} }
} }
else
{
ModelState.AddModelError(nameof(vm.DerivationScheme), "Please provide your extended public key");
return View(vm.ViewName, vm);
}
var oldConfig = vm.Config; var oldConfig = vm.Config;
vm.Config = strategy?.ToJson(); vm.Config = strategy?.ToJson();