From 7f57d1bfd3deeeb0c117689e9fa3b1ffe0b1b8c5 Mon Sep 17 00:00:00 2001 From: julia-zack Date: Fri, 14 Jun 2024 13:22:48 -0300 Subject: [PATCH 1/2] Add getRetiringFederationAddress tests --- .../federation/FederationSupportImplTest.java | 72 ++++++++++++++++--- 1 file changed, 64 insertions(+), 8 deletions(-) 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 index 8162634139..ec1f38bf0e 100644 --- a/rskj-core/src/test/java/co/rsk/peg/federation/FederationSupportImplTest.java +++ b/rskj-core/src/test/java/co/rsk/peg/federation/FederationSupportImplTest.java @@ -795,6 +795,13 @@ void getRetiringFederation_returnsNull() { Federation retiringFederation = federationSupport.getRetiringFederation(); assertThat(retiringFederation, is(nullValue())); } + + @Test + @Tag("getRetiringFederationAddress") + void getRetiringFederationAddress_returnsNull() { + Address retiringFederationAddress = federationSupport.getRetiringFederationAddress(); + assertThat(retiringFederationAddress, is(nullValue())); + } } @Nested @@ -825,6 +832,13 @@ void getRetiringFederation_returnsNull() { Federation retiringFederation = federationSupport.getRetiringFederation(); assertThat(retiringFederation, is(nullValue())); } + + @Test + @Tag("getRetiringFederationAddress") + void getRetiringFederationAddress_returnsNull() { + Address retiringFederationAddress = federationSupport.getRetiringFederationAddress(); + assertThat(retiringFederationAddress, is(nullValue())); + } } @Nested @@ -889,14 +903,6 @@ void getRetiringFederation_withNewFederationNotActive_returnsNull( assertThat(retiringFederation, is(nullValue())); } - private Stream newFederationNotActiveActivationArgs() { - return Stream.of( - Arguments.of(blockNumberFederationActivationHop - 1, hopActivations), - Arguments.of(blockNumberFederationActivationHop, fingerrootActivations), - Arguments.of(blockNumberFederationActivationFingerroot - 1, fingerrootActivations) - ); - } - @ParameterizedTest @Tag("getRetiringFederation") @MethodSource("newFederationActiveActivationArgs") @@ -918,6 +924,56 @@ void getRetiringFederation_withNewFederationActive_returnsOldFederation( assertThat(retiringFederation, is(oldFederation)); } + @ParameterizedTest + @Tag("getRetiringFederationAddress") + @MethodSource("newFederationNotActiveActivationArgs") + void getRetiringFederationAddress_withNewFederationNotActive_returnsNull( + long currentBlock, + ActivationConfig.ForBlock activations) { + + Block executionBlock = mock(Block.class); + when(executionBlock.getNumber()).thenReturn(currentBlock); + + federationSupport = federationSupportBuilder + .withFederationConstants(federationMainnetConstants) + .withFederationStorageProvider(storageProvider) + .withRskExecutionBlock(executionBlock) + .withActivations(activations) + .build(); + + Address retiringFederationAddress = federationSupport.getRetiringFederationAddress(); + assertThat(retiringFederationAddress, is(nullValue())); + } + + @ParameterizedTest + @Tag("getRetiringFederation") + @MethodSource("newFederationActiveActivationArgs") + void getRetiringFederationAddress_withNewFederationActive_returnsOldFederationAddress( + long currentBlock, + ActivationConfig.ForBlock activations) { + + Block executionBlock = mock(Block.class); + when(executionBlock.getNumber()).thenReturn(currentBlock); + + federationSupport = federationSupportBuilder + .withFederationConstants(federationMainnetConstants) + .withFederationStorageProvider(storageProvider) + .withRskExecutionBlock(executionBlock) + .withActivations(activations) + .build(); + + Address retiringFederationAddress = federationSupport.getRetiringFederationAddress(); + assertThat(retiringFederationAddress, is(oldFederation.getAddress())); + } + + private Stream newFederationNotActiveActivationArgs() { + return Stream.of( + Arguments.of(blockNumberFederationActivationHop - 1, hopActivations), + Arguments.of(blockNumberFederationActivationHop, fingerrootActivations), + Arguments.of(blockNumberFederationActivationFingerroot - 1, fingerrootActivations) + ); + } + private Stream newFederationActiveActivationArgs() { return Stream.of( Arguments.of(blockNumberFederationActivationHop, hopActivations), From 76e98ed33df79f9fce0eb10b00eb25cfc1c0bf69 Mon Sep 17 00:00:00 2001 From: julia-zack Date: Fri, 14 Jun 2024 14:20:48 -0300 Subject: [PATCH 2/2] Add getRetiringFederationSize tests --- .../federation/FederationSupportImplTest.java | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) 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 index ec1f38bf0e..5a54947ab3 100644 --- a/rskj-core/src/test/java/co/rsk/peg/federation/FederationSupportImplTest.java +++ b/rskj-core/src/test/java/co/rsk/peg/federation/FederationSupportImplTest.java @@ -802,6 +802,13 @@ void getRetiringFederationAddress_returnsNull() { Address retiringFederationAddress = federationSupport.getRetiringFederationAddress(); assertThat(retiringFederationAddress, is(nullValue())); } + + @Test + @Tag("getRetiringFederationSize") + void getRetiringFederationSize_returnsRetiringFederationNonExistentResponseCode() { + int retiringFederationSize = federationSupport.getRetiringFederationSize(); + assertThat(retiringFederationSize, is(FederationChangeResponseCode.RETIRING_FEDERATION_NON_EXISTENT.getCode())); + } } @Nested @@ -839,6 +846,13 @@ void getRetiringFederationAddress_returnsNull() { Address retiringFederationAddress = federationSupport.getRetiringFederationAddress(); assertThat(retiringFederationAddress, is(nullValue())); } + + @Test + @Tag("getRetiringFederationSize") + void getRetiringFederationSize_returnsRetiringFederationNonExistentResponseCode() { + int retiringFederationSize = federationSupport.getRetiringFederationSize(); + assertThat(retiringFederationSize, is(FederationChangeResponseCode.RETIRING_FEDERATION_NON_EXISTENT.getCode())); + } } @Nested @@ -966,6 +980,47 @@ void getRetiringFederationAddress_withNewFederationActive_returnsOldFederationAd assertThat(retiringFederationAddress, is(oldFederation.getAddress())); } + @ParameterizedTest + @Tag("getRetiringFederationSize") + @MethodSource("newFederationNotActiveActivationArgs") + void getRetiringFederationSize_withNewFederationNotActive_returnsRetiringFederationNonExistentResponseCode( + long currentBlock, + ActivationConfig.ForBlock activations) { + + Block executionBlock = mock(Block.class); + when(executionBlock.getNumber()).thenReturn(currentBlock); + + federationSupport = federationSupportBuilder + .withFederationConstants(federationMainnetConstants) + .withFederationStorageProvider(storageProvider) + .withRskExecutionBlock(executionBlock) + .withActivations(activations) + .build(); + + int retiringFederationSize = federationSupport.getRetiringFederationSize(); + assertThat(retiringFederationSize, is(FederationChangeResponseCode.RETIRING_FEDERATION_NON_EXISTENT.getCode())); + } + + @ParameterizedTest + @Tag("getRetiringFederationSize") + @MethodSource("newFederationActiveActivationArgs") + void getRetiringFederationSize_withNewFederationActive_returnsOldFederationSize( + long currentBlock, + ActivationConfig.ForBlock activations) { + + Block executionBlock = mock(Block.class); + when(executionBlock.getNumber()).thenReturn(currentBlock); + + federationSupport = federationSupportBuilder + .withFederationConstants(federationMainnetConstants) + .withFederationStorageProvider(storageProvider) + .withRskExecutionBlock(executionBlock) + .withActivations(activations) + .build(); + int retiringFederationSize = federationSupport.getRetiringFederationSize(); + assertThat(retiringFederationSize, is(oldFederation.getSize())); + } + private Stream newFederationNotActiveActivationArgs() { return Stream.of( Arguments.of(blockNumberFederationActivationHop - 1, hopActivations),