Migration-transaction-multiple-utxos integration

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

@@ -849,14 +849,7 @@ public byte[] getFederatorPublicKeyOfType(Object[] args) throws VMException {
     public Long getFederationCreationTime(Object[] args) {
         logger.trace("getFederationCreationTime");
         Instant activeFederationCreationTime = bridgeSupport.getActiveFederationCreationTime();
-
-        if (!activations.isActive(ConsensusRule.RSKIP419)) {
-            // Return the creation time in milliseconds from the epoch
-            return activeFederationCreationTime.toEpochMilli();
-        }
-
-        // Return the creation time in seconds from the epoch
-        return activeFederationCreationTime.getEpochSecond();
+        return getFederationCreationTimeEpochBasedOnActivation(activeFederationCreationTime);
     }
 
     public long getFederationCreationBlockNumber(Object[] args) {
@@ -880,13 +873,14 @@ public String getRetiringFederationAddress(Object[] args) {
     public Integer getRetiringFederationSize(Object[] args) {
         logger.trace("getRetiringFederationSize");
 
-        return bridgeSupport.getRetiringFederationSize();
+        return bridgeSupport.getRetiringFederationSize()
+            .orElseGet(FederationChangeResponseCode.FEDERATION_NON_EXISTENT::getCode);
     }
 
     public Integer getRetiringFederationThreshold(Object[] args) {
         logger.trace("getRetiringFederationThreshold");
 
-        return bridgeSupport.getRetiringFederationThreshold();
+        return bridgeSupport.getRetiringFederationThreshold().orElseGet(FederationChangeResponseCode.FEDERATION_NON_EXISTENT::getCode);
     }
 
     public byte[] getRetiringFederatorPublicKey(Object[] args) {
@@ -929,13 +923,12 @@ public byte[] getRetiringFederatorPublicKeyOfType(Object[] args) throws VMExcept
     public Long getRetiringFederationCreationTime(Object[] args) {
         logger.trace("getRetiringFederationCreationTime");
 
-        Instant retiringFederationCreationTime = bridgeSupport.getRetiringFederationCreationTime();
-
-        if (retiringFederationCreationTime == null) {
-            // -1 is returned when no retiring federation
-            return -1L;
-        }
+        Optional<Instant> retiringFederationCreationTime = bridgeSupport.getRetiringFederationCreationTime();
+        return retiringFederationCreationTime.map(this::getFederationCreationTimeEpochBasedOnActivation)
+            .orElse((long) FederationChangeResponseCode.FEDERATION_NON_EXISTENT.getCode());
+    }
 
+    private Long getFederationCreationTimeEpochBasedOnActivation(Instant retiringFederationCreationTime) {
         if (!activations.isActive(ConsensusRule.RSKIP419)) {
             // Return the creation time in milliseconds from the epoch
             return retiringFederationCreationTime.toEpochMilli();
@@ -947,7 +940,8 @@ public Long getRetiringFederationCreationTime(Object[] args) {
 
     public long getRetiringFederationCreationBlockNumber(Object[] args) {
         logger.trace("getRetiringFederationCreationBlockNumber");
-        return bridgeSupport.getRetiringFederationCreationBlockNumber();
+        return bridgeSupport.getRetiringFederationCreationBlockNumber()
+            .orElse((long) FederationChangeResponseCode.FEDERATION_NON_EXISTENT.getCode());
     }
 
     public Integer createFederation(Object[] args) {
@@ -1605,8 +1599,8 @@ public static BridgeMethods.BridgeMethodExecutor activeAndRetiringFederationOnly
         return (self, args) -> {
             boolean isFromActiveFed = BridgeUtils.isFromFederateMember(self.rskTx, self.bridgeSupport.getActiveFederation(), self.signatureCache);
 
-            Federation retiringFederation = self.bridgeSupport.getRetiringFederation();
-            boolean isFromRetiringFed = retiringFederation != null && BridgeUtils.isFromFederateMember(self.rskTx, retiringFederation, self.signatureCache);
+            Optional<Federation> retiringFederation = self.bridgeSupport.getRetiringFederation();
+            boolean isFromRetiringFed = retiringFederation.isPresent() && BridgeUtils.isFromFederateMember(self.rskTx, retiringFederation.get(), self.signatureCache);
 
             if (!isFromActiveFed && !isFromRetiringFed) {
                 String errorMessage = String.format(
@@ -1625,8 +1619,8 @@ public static BridgeMethods.BridgeMethodExecutor activeRetiringAndProposedFedera
         return (self, args) -> {
             boolean isFromActiveFed = BridgeUtils.isFromFederateMember(self.rskTx, self.bridgeSupport.getActiveFederation(), self.signatureCache);
 
-            Federation retiringFederation = self.bridgeSupport.getRetiringFederation();
-            boolean isFromRetiringFed = retiringFederation != null && BridgeUtils.isFromFederateMember(self.rskTx, retiringFederation, self.signatureCache);
+            Optional<Federation> retiringFederation = self.bridgeSupport.getRetiringFederation();
+            boolean isFromRetiringFed = retiringFederation.isPresent() && BridgeUtils.isFromFederateMember(self.rskTx, retiringFederation.get(), self.signatureCache);
 
             Optional<Federation> proposedFederation = self.bridgeSupport.getProposedFederation();
             boolean isFromProposedFed = proposedFederation.isPresent() && BridgeUtils.isFromFederateMember(self.rskTx, proposedFederation.get(), self.signatureCache);