Add getProposedFederation method in FederationSupport

rsksmart · Aug 15, 2024 · daa5846 · daa5846
1 parent 759adf4
commit daa5846
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 0 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupport.java b/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupport.java
@@ -47,6 +47,8 @@ public interface FederationSupport {
     byte[] getPendingFederatorBtcPublicKey(int index);
     byte[] getPendingFederatorPublicKeyOfType(int index, FederationMember.KeyType keyType);
 
+    Optional<Federation> getProposedFederation();
+
     int voteFederationChange(Transaction tx, ABICallSpec callSpec, SignatureCache signatureCache, BridgeEventLogger eventLogger);
     long getActiveFederationCreationBlockHeight();
     Optional<Script> getLastRetiredFederationP2SHScript();

diff --git a/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupportImpl.java b/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupportImpl.java
@@ -370,6 +370,11 @@ public byte[] getPendingFederatorPublicKeyOfType(int index, FederationMember.Key
         return getFederationMemberPublicKeyOfType(currentPendingFederation.getMembers(), index, keyType, "Federator");
     }
 
+    @Override
+    public Optional<Federation> getProposedFederation() {
+        return provider.getProposedFederation(constants, activations);
+    }
+
     @Override
     public int voteFederationChange(Transaction tx, ABICallSpec callSpec, SignatureCache signatureCache, BridgeEventLogger eventLogger) {
         String calledFunction = callSpec.getFunction();

diff --git a/rskj-core/src/test/java/co/rsk/peg/federation/FederationSupportImplTest.java b/rskj-core/src/test/java/co/rsk/peg/federation/FederationSupportImplTest.java
@@ -70,6 +70,7 @@ class FederationSupportImplTest {
 
     private static final FederationConstants federationMainnetConstants = FederationMainNetConstants.getInstance();
     private final Federation genesisFederation = FederationTestUtils.getGenesisFederation(federationMainnetConstants);
+    private ActivationConfig.ForBlock activations;
     private ErpFederation newFederation;
     private StorageAccessor storageAccessor;
     private FederationStorageProvider storageProvider;
@@ -3391,6 +3392,46 @@ private ABICallSpec getAddMultiKeysVote(FederationMember federationMember) {
         }
     }
 
+    @Test
+    void getProposedFederation_whenStorageProviderReturnsEmpty_shouldReturnEmpty() {
+        // arrange
+        activations = ActivationConfigsForTest.all().forBlock(0L);
+
+        storageProvider = mock(FederationStorageProvider.class);
+        when(storageProvider.getProposedFederation(federationMainnetConstants, activations)).thenReturn(Optional.empty());
+
+        federationSupport = federationSupportBuilder
+            .withFederationConstants(federationMainnetConstants)
+            .withFederationStorageProvider(storageProvider)
+            .withActivations(activations)
+            .build();
+
+        // act
+        Optional<Federation> actualProposedFederation = federationSupport.getProposedFederation();
+
+        // assert
+        assertFalse(actualProposedFederation.isPresent());
+    }
+
+    @Test
+    void getProposedFederation_whenStorageProviderReturnsProposedFederation_shouldReturnProposedFederation() {
+        // arrange
+        activations = ActivationConfigsForTest.all().forBlock(0L);
+        Federation proposedFederation = new P2shErpFederationBuilder().build();
+
+        storageProvider = mock(FederationStorageProvider.class);
+        when(storageProvider.getProposedFederation(federationMainnetConstants, activations)).thenReturn(Optional.of(proposedFederation));
+
+        federationSupport = federationSupportBuilder
+            .withFederationConstants(federationMainnetConstants)
+            .withFederationStorageProvider(storageProvider)
+            .withActivations(activations)
+            .build();
+
+        Optional<Federation> actualProposedFederation = federationSupport.getProposedFederation();
+        assertTrue(actualProposedFederation.isPresent());
+        assertEquals(proposedFederation, actualProposedFederation.get());
+    }
 
     private List<ECKey> getRskPublicKeysFromFederationMembers(List<FederationMember> members) {
         return members.stream()