refactor unused method

Signed-off-by: Frank Li <b439988l@gmail.com>

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java

@@ -17,11 +17,9 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import com.google.common.annotations.VisibleForTesting;
 import io.vertx.core.Handler;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.auth.User;
@@ -31,15 +29,6 @@
 public class AuthenticationUtils {
   private static final Logger LOG = LoggerFactory.getLogger(AuthenticationUtils.class);
 
-  @VisibleForTesting
-  public static boolean isPermitted(
-      final Optional<AuthenticationService> authenticationService,
-      final Optional<User> optionalUser,
-      final JsonRpcMethod jsonRpcMethod) {
-    return isPermitted(authenticationService, optionalUser, jsonRpcMethod, Collections.emptyList());
-  }
-
-  @VisibleForTesting
   public static boolean isPermitted(
       final Optional<AuthenticationService> authenticationService,
       final Optional<User> optionalUser,

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java

@@ -398,26 +398,41 @@ public void checkJsonRpcMethodsAvailableWithGoodCredentialsAndPermissions() thro
             // single eth/blockNumber method permitted
             Assertions.assertThat(
                     AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), ethBlockNumber))
+                        service.authenticationService,
+                        Optional.of(user),
+                        ethBlockNumber,
+                        Collections.emptyList()))
                 .isTrue();
             // eth/accounts NOT permitted
             assertThat(
                     AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), ethAccounts))
+                        service.authenticationService,
+                        Optional.of(user),
+                        ethAccounts,
+                        Collections.emptyList()))
                 .isFalse();
             // allowed by web3/*
             assertThat(
                     AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), web3ClientVersion))
+                        service.authenticationService,
+                        Optional.of(user),
+                        web3ClientVersion,
+                        Collections.emptyList()))
                 .isTrue();
             assertThat(
                     AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), web3Sha3))
+                        service.authenticationService,
+                        Optional.of(user),
+                        web3Sha3,
+                        Collections.emptyList()))
                 .isTrue();
             // NO net permissions
             assertThat(
                     AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), netVersion))
+                        service.authenticationService,
+                        Optional.of(user),
+                        netVersion,
+                        Collections.emptyList()))
                 .isFalse();
           });
     }
@@ -458,26 +473,41 @@ public void checkJsonRpcMethodsAvailableWithGoodCredentialsAndAllPermissions()
             // single eth/blockNumber method permitted
             Assertions.assertThat(
                     AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), ethBlockNumber))
+                        service.authenticationService,
+                        Optional.of(user),
+                        ethBlockNumber,
+                        Collections.emptyList()))
                 .isTrue();
             // eth/accounts IS permitted
             assertThat(
                     AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), ethAccounts))
+                        service.authenticationService,
+                        Optional.of(user),
+                        ethAccounts,
+                        Collections.emptyList()))
                 .isTrue();
             // allowed by *:*
             assertThat(
                     AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), web3ClientVersion))
+                        service.authenticationService,
+                        Optional.of(user),
+                        web3ClientVersion,
+                        Collections.emptyList()))
                 .isTrue();
             assertThat(
                     AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), web3Sha3))
+                        service.authenticationService,
+                        Optional.of(user),
+                        web3Sha3,
+                        Collections.emptyList()))
                 .isTrue();
             // YES net permissions
             assertThat(
                     AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), netVersion))
+                        service.authenticationService,
+                        Optional.of(user),
+                        netVersion,
+                        Collections.emptyList()))
                 .isTrue();
           });
     }
@@ -489,7 +519,10 @@ public void checkPermissionsWithEmptyUser() {
 
     assertThat(
             AuthenticationUtils.isPermitted(
-                service.authenticationService, Optional.empty(), ethAccounts))
+                service.authenticationService,
+                Optional.empty(),
+                ethAccounts,
+                Collections.emptyList()))
         .isFalse();
   }