From 93ffb85b3d3874d08beb2127e70a278444eaec93 Mon Sep 17 00:00:00 2001
From: meowsbits <45600330+meowsbits@users.noreply.github.com>
Date: Sat, 21 Mar 2020 09:28:27 -0500
Subject: [PATCH] rpc: dont log an error if user configures --rpcapi=rpc...
 (#20776)

This just prevents a false negative ERROR warning when, for some unknown
reason, a user attempts to turn on the module rpc even though it's already going
to be on.
---
 rpc/endpoints.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rpc/endpoints.go b/rpc/endpoints.go
index ed295adfc0..09f389d71b 100644
--- a/rpc/endpoints.go
+++ b/rpc/endpoints.go
@@ -22,8 +22,9 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 )
 
-// checkModuleAvailability check that all names given in modules are actually
-// available API services.
+// checkModuleAvailability checks that all names given in modules are actually
+// available API services. It assumes that the MetadataApi module ("rpc") is always available;
+// the registration of this "rpc" module happens in NewServer() and is thus common to all endpoints.
 func checkModuleAvailability(modules []string, apis []API) (bad, available []string) {
 	availableSet := make(map[string]struct{})
 	for _, api := range apis {
@@ -33,7 +34,7 @@ func checkModuleAvailability(modules []string, apis []API) (bad, available []str
 		}
 	}
 	for _, name := range modules {
-		if _, ok := availableSet[name]; !ok {
+		if _, ok := availableSet[name]; !ok && name != MetadataApi {
 			bad = append(bad, name)
 		}
 	}