From 26024bd6ec0155dca6b8f3bb484df789535866af Mon Sep 17 00:00:00 2001
From: sqrrm <sqrrm1@gmail.com>
Date: Tue, 15 Dec 2020 19:35:49 +0100
Subject: [PATCH] Refactor: rename methods, move return statement

---
 .../account/witness/AccountAgeWitnessService.java     | 11 +++++------
 .../content/fiataccounts/FiatAccountsView.java        |  2 +-
 .../overlays/windows/SignSpecificWitnessWindow.java   |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java b/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
index cc8312aae8..e947cba128 100644
--- a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
+++ b/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
@@ -882,13 +882,13 @@ public class AccountAgeWitnessService {
                 tradeAmountIsSufficient(trade.getTradeAmount());
     }
 
-    public String signInfoFromAccount(PaymentAccount paymentAccount) {
+    public String getSignInfoFromAccount(PaymentAccount paymentAccount) {
         var pubKey = keyRing.getSignatureKeyPair().getPublic();
         var witness = getMyWitness(paymentAccount.getPaymentAccountPayload());
         return Utilities.bytesAsHexString(witness.getHash()) + "," + Utilities.bytesAsHexString(pubKey.getEncoded());
     }
 
-    public Tuple2<AccountAgeWitness, byte[]> signInfoFromString(String signInfo) {
+    public Tuple2<AccountAgeWitness, byte[]> getSignInfoFromString(String signInfo) {
         var parts = signInfo.split(",");
         if (parts.length != 2) {
             return null;
@@ -899,12 +899,11 @@ public class AccountAgeWitnessService {
             var accountAgeWitnessHash = Utilities.decodeFromHex(parts[0]);
             pubKeyHash = Utilities.decodeFromHex(parts[1]);
             accountAgeWitness = getWitnessByHash(accountAgeWitnessHash);
+            return accountAgeWitness
+                    .map(ageWitness -> new Tuple2<>(ageWitness, pubKeyHash))
+                    .orElse(null);
         } catch (Exception e) {
             return null;
         }
-
-        return accountAgeWitness
-                .map(ageWitness -> new Tuple2<>(ageWitness, pubKeyHash))
-                .orElse(null);
     }
 }
diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
index 0beb173797..4e5880de3c 100644
--- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
+++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
@@ -547,7 +547,7 @@ public class FiatAccountsView extends PaymentAccountsView<GridPane, FiatAccounts
         if (selectedAccount == null) {
             return;
         }
-        Utilities.copyToClipboard(accountAgeWitnessService.signInfoFromAccount(selectedAccount));
+        Utilities.copyToClipboard(accountAgeWitnessService.getSignInfoFromAccount(selectedAccount));
     }
 
 }
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignSpecificWitnessWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignSpecificWitnessWindow.java
index ac3b5c9252..2185921358 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignSpecificWitnessWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SignSpecificWitnessWindow.java
@@ -94,7 +94,7 @@ public class SignSpecificWitnessWindow extends Overlay<SignSpecificWitnessWindow
             if (newValue == null || newValue.isEmpty()) {
                 return;
             }
-            signInfo = accountAgeWitnessService.signInfoFromString(newValue);
+            signInfo = accountAgeWitnessService.getSignInfoFromString(newValue);
             if (signInfo == null) {
                 actionButton.setDisable(true);
                 return;