Create updateSvpState method and make all svp-related-methods private

Minor refactors to avoid duplication code

Rewrite comment

Fix sonar complains

Handle exception when processing fund transaction. Add logs for when updating svp state

Add debug level log for when proposed fed does not exist

Not allow validation period end block to be part of validation ongoing period

Make updateSvpState private. Call it from updateCollections

Add missing import

Fix test

rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java

@@ -1010,20 +1010,60 @@ public void updateCollections(Transaction rskTx) throws IOException {
         processConfirmedPegouts(rskTx);
 
         updateFederationCreationBlockHeights();
+
+        updateSvpState(rskTx);
     }
 
     private void logUpdateCollections(Transaction rskTx) {
         RskAddress sender = rskTx.getSender(signatureCache);
         eventLogger.logUpdateCollections(sender);
     }
 
-    protected void processSVPFailure(Federation proposedFederation) {
+    private void updateSvpState(Transaction rskTx) {
+        Optional<Federation> proposedFederationOpt = federationSupport.getProposedFederation();
+        if (proposedFederationOpt.isEmpty()) {
+            logger.debug("[updateSvpState] Proposed federation does not exist, so there's no svp going on.");
+            return;
+        }
+
+        // if the proposed federation exists and the validation period ended,
+        // we can conclude that the svp failed
+        Federation proposedFederation = proposedFederationOpt.get();
+        if (!validationPeriodIsOngoing(proposedFederation)) {
+            logger.info(
+                "[updateSvpState] Proposed federation validation failed at block {}. SVP failure will be processed",
+                rskExecutionBlock.getNumber()
+            );
+            processSVPFailure(proposedFederation);
+            return;
+        }
+
+        Keccak256 rskTxHash = rskTx.getHash();
+        // if the fund tx signed is present, then the fund transaction change was registered,
+        // meaning we can create the spend tx.
+        Optional<BtcTransaction> svpFundTxSigned = provider.getSvpFundTxSigned();
+        if (svpFundTxSigned.isPresent()) {
+            logger.info(
+                "[updateSvpState] Fund tx signed was found, so spend tx creation will be processed."
+            );
+            processSvpSpendTransactionUnsigned(rskTxHash, proposedFederation, svpFundTxSigned.get());
+            return;
+        }
+
+        // if the unsigned fund tx hash is not present, meaning we can proceed with the fund tx creation
+        Optional<Sha256Hash> svpFundTxHashUnsigned = provider.getSvpFundTxHashUnsigned();
+        if (svpFundTxHashUnsigned.isEmpty()) {
+            logger.info(
+                "[updateSvpState] Fund tx hash unsigned was not found, so fund tx creation will be processed."
+            );
+            processSvpFundTransactionUnsigned(rskTxHash, proposedFederation);
+        }
+    }
+
+    private void processSVPFailure(Federation proposedFederation) {
         eventLogger.logCommitFederationFailure(rskExecutionBlock, proposedFederation);
-        logger.warn(
-            "[processSVPFailure] Proposed federation validation failed at block {}, so federation election will be allowed again.",
-            rskExecutionBlock.getNumber()
-        );
 
+        logger.info("[processSVPFailure] Federation election will be allowed again.");
         allowFederationElectionAgain();
     }
 
@@ -1045,21 +1085,24 @@ private boolean validationPeriodIsOngoing(Federation proposedFederation) {
         return rskExecutionBlock.getNumber() < validationPeriodEndBlock;
     }
 
-    protected void processSvpFundTransactionUnsigned(Transaction rskTx) throws IOException, InsufficientMoneyException {
-        Optional<Federation> proposedFederationOpt = federationSupport.getProposedFederation();
-        if (proposedFederationOpt.isEmpty()) {
-            String message = "Proposed federation should be present when processing SVP fund transaction.";
-            logger.warn(message);
-            throw new IllegalStateException(message);
-        }
-        Federation proposedFederation = proposedFederationOpt.get();
-
+    private void processSvpFundTransactionUnsigned(Keccak256 rskTxHash, Federation proposedFederation) {
         Coin spendableValueFromProposedFederation = bridgeConstants.getSpendableValueFromProposedFederation();
-        BtcTransaction svpFundTransactionUnsigned = createSvpFundTransaction(proposedFederation, spendableValueFromProposedFederation);
-
-        provider.setSvpFundTxHashUnsigned(svpFundTransactionUnsigned.getHash());
-        PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = provider.getPegoutsWaitingForConfirmations();
-        settleReleaseRequest(pegoutsWaitingForConfirmations, svpFundTransactionUnsigned, rskTx.getHash(), spendableValueFromProposedFederation);
+        try {
+            BtcTransaction svpFundTransactionUnsigned = createSvpFundTransaction(proposedFederation, spendableValueFromProposedFederation);
+            provider.setSvpFundTxHashUnsigned(svpFundTransactionUnsigned.getHash());
+            PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = provider.getPegoutsWaitingForConfirmations();
+            settleReleaseRequest(pegoutsWaitingForConfirmations, svpFundTransactionUnsigned, rskTxHash, spendableValueFromProposedFederation);
+        } catch (InsufficientMoneyException e) {
+            logger.error(
+                "[processSvpFundTransactionUnsigned] Insufficient funds for creating the fund transaction. Error message: {}",
+                e.getMessage()
+            );
+        } catch (IOException e) {
+            logger.error(
+                "[processSvpFundTransactionUnsigned] IOException getting the pegouts waiting for confirmations. Error message: {}",
+                e.getMessage()
+            );
+        }
     }
 
     private BtcTransaction createSvpFundTransaction(Federation proposedFederation, Coin spendableValueFromProposedFederation) throws InsufficientMoneyException {
@@ -1092,19 +1135,13 @@ private SendRequest createSvpFundTransactionSendRequest(BtcTransaction transacti
         return sendRequest;
     }
 
-    protected void processSvpSpendTransactionUnsigned(Transaction rskTx) {
-        federationSupport.getProposedFederation()
-            .ifPresent(proposedFederation -> provider.getSvpFundTxSigned()
-            .ifPresent(svpFundTxSigned -> {
-                BtcTransaction svpSpendTransactionUnsigned = createSvpSpendTransaction(svpFundTxSigned, proposedFederation);
-
-                Keccak256 rskTxHash = rskTx.getHash();
-                updateSvpSpendTransactionValues(rskTxHash, svpSpendTransactionUnsigned);
+    private void processSvpSpendTransactionUnsigned(Keccak256 rskTxHash, Federation proposedFederation, BtcTransaction svpFundTxSigned) {
+        BtcTransaction svpSpendTransactionUnsigned = createSvpSpendTransaction(svpFundTxSigned, proposedFederation);
+        updateSvpSpendTransactionValues(rskTxHash, svpSpendTransactionUnsigned);
 
-                Coin amountSentToActiveFed = svpSpendTransactionUnsigned.getOutput(0).getValue();
-                logReleaseRequested(rskTxHash, svpSpendTransactionUnsigned, amountSentToActiveFed);
-                logPegoutTransactionCreated(svpSpendTransactionUnsigned);
-            }));
+        Coin amountSentToActiveFed = svpSpendTransactionUnsigned.getOutput(0).getValue();
+        logReleaseRequested(rskTxHash, svpSpendTransactionUnsigned, amountSentToActiveFed);
+        logPegoutTransactionCreated(svpSpendTransactionUnsigned);
     }
 
     private BtcTransaction createSvpSpendTransaction(BtcTransaction svpFundTxSigned, Federation proposedFederation) {