Rename parse method on InetAddressUtils to createCidrBlock

rsksmart · Aug 23, 2023 · e0d0f00 · e0d0f00
1 parent 73b9118
commit e0d0f00
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/scoring/InetAddressUtils.java b/rskj-core/src/main/java/co/rsk/scoring/InetAddressUtils.java
@@ -74,7 +74,7 @@ public static InetAddress getAddressForBan(@CheckForNull String hostname) throws
      * @return the text converted to an InetAddressBlock
      * @throws InvalidInetAddressException if the text is invalid
      */
-    public static InetAddressCidrBlock parse(String text) throws InvalidInetAddressException {
+    public static InetAddressCidrBlock createCidrBlock(String text) throws InvalidInetAddressException {
         //TODO(mmarquez): should we validate address format ??
         String[] parts = text.split("/");
 
@@ -90,11 +90,11 @@ public static InetAddressCidrBlock parse(String text) throws InvalidInetAddressE
             throw new InvalidInetAddressBlockException("Invalid mask", ex);
         }
 
-        return parse(address, nbits);
+        return createCidrBlock(address, nbits);
     }
 
 
-    public static InetAddressCidrBlock parse(InetAddress address, int nbits) throws InvalidInetAddressException {
+    public static InetAddressCidrBlock createCidrBlock(InetAddress address, int nbits) throws InvalidInetAddressException {
         if (nbits <= 0 || nbits > address.getAddress().length * 8) {
             throw new InvalidInetAddressBlockException("Invalid mask", null);
         }

diff --git a/rskj-core/src/main/java/co/rsk/scoring/PeerScoringManager.java b/rskj-core/src/main/java/co/rsk/scoring/PeerScoringManager.java
@@ -203,7 +203,7 @@ public void banAddress(InetAddress address) {
     public void banAddress(String address) throws InvalidInetAddressException {
         boolean isAddressBlock = InetAddressUtils.hasMask(address);
         if (isAddressBlock) {
-            this.banAddressBlock(InetAddressUtils.parse(address));
+            this.banAddressBlock(InetAddressUtils.createCidrBlock(address));
         } else {
             this.banAddress(InetAddressUtils.getAddressForBan(address));
         }
@@ -232,7 +232,7 @@ public void unbanAddress(InetAddress address) {
     public void unbanAddress(String address) throws InvalidInetAddressException {
         boolean isAddressBlock = InetAddressUtils.hasMask(address);
         if (isAddressBlock) {
-            this.unbanAddressBlock(InetAddressUtils.parse(address));
+            this.unbanAddressBlock(InetAddressUtils.createCidrBlock(address));
         } else {
             this.unbanAddress(InetAddressUtils.getAddressForBan(address));
         }

diff --git a/rskj-core/src/main/java/org/ethereum/net/server/ChannelManagerImpl.java b/rskj-core/src/main/java/org/ethereum/net/server/ChannelManagerImpl.java
@@ -298,7 +298,7 @@ public boolean isAddressBlockAvailable(InetAddress inetAddress) {
             return activePeers.values().stream()
                     .map(ch -> {
                         try {
-                            return InetAddressUtils.parse(ch.getInetSocketAddress().getAddress(), networkCIDR);
+                            return InetAddressUtils.createCidrBlock(ch.getInetSocketAddress().getAddress(), networkCIDR);
                         } catch (InvalidInetAddressException e) {
                             logger.error(e.getMessage(), e);
                         }

diff --git a/rskj-core/src/test/java/co/rsk/scoring/InetAddressUtilsTest.java b/rskj-core/src/test/java/co/rsk/scoring/InetAddressUtilsTest.java
@@ -117,7 +117,7 @@ void getAnyLocalAddress() {
 
     @Test
     void parseAddressBlock() throws InvalidInetAddressException, InvalidInetAddressBlockException, UnknownHostException {
-        InetAddressCidrBlock result = InetAddressUtils.parse("192.162.12.0/24");
+        InetAddressCidrBlock result = InetAddressUtils.createCidrBlock("192.162.12.0/24");
 
         Assertions.assertNotNull(result);
         Assertions.assertArrayEquals(InetAddress.getByName("192.162.12.0").getAddress(), result.getBytes());
@@ -127,7 +127,7 @@ void parseAddressBlock() throws InvalidInetAddressException, InvalidInetAddressB
     @Test
     void parseAddressBlockWithNonNumericBits() throws InvalidInetAddressException {
         try {
-            InetAddressUtils.parse("192.162.12.0/a");
+            InetAddressUtils.createCidrBlock("192.162.12.0/a");
             Assertions.fail();
         }
         catch (InvalidInetAddressBlockException ex) {
@@ -138,7 +138,7 @@ void parseAddressBlockWithNonNumericBits() throws InvalidInetAddressException {
     @Test
     void parseAddressBlockWithNegativeNumberOfBits() throws UnknownHostException, InvalidInetAddressException {
         try {
-            InetAddressUtils.parse("192.162.12.0/-10");
+            InetAddressUtils.createCidrBlock("192.162.12.0/-10");
             Assertions.fail();
         }
         catch (InvalidInetAddressBlockException ex) {
@@ -149,7 +149,7 @@ void parseAddressBlockWithNegativeNumberOfBits() throws UnknownHostException, In
     @Test
     void parseAddressBlockWithZeroBits() throws InvalidInetAddressException {
         try {
-            InetAddressUtils.parse("192.162.12.0/0");
+            InetAddressUtils.createCidrBlock("192.162.12.0/0");
             Assertions.fail();
         }
         catch (InvalidInetAddressBlockException ex) {
@@ -160,7 +160,7 @@ void parseAddressBlockWithZeroBits() throws InvalidInetAddressException {
     @Test
     void parseAddressBlockWithTooBigNumberOfBits() throws InvalidInetAddressException {
         try {
-            InetAddressUtils.parse("192.162.12.0/1000");
+            InetAddressUtils.createCidrBlock("192.162.12.0/1000");
             Assertions.fail();
         }
         catch (InvalidInetAddressBlockException ex) {