Unverified Commit 93ffb85b authored by meowsbits's avatar meowsbits Committed by GitHub

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.
parent e943f07a
...@@ -22,8 +22,9 @@ import ( ...@@ -22,8 +22,9 @@ import (
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
) )
// checkModuleAvailability check that all names given in modules are actually // checkModuleAvailability checks that all names given in modules are actually
// available API services. // 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) { func checkModuleAvailability(modules []string, apis []API) (bad, available []string) {
availableSet := make(map[string]struct{}) availableSet := make(map[string]struct{})
for _, api := range apis { for _, api := range apis {
...@@ -33,7 +34,7 @@ func checkModuleAvailability(modules []string, apis []API) (bad, available []str ...@@ -33,7 +34,7 @@ func checkModuleAvailability(modules []string, apis []API) (bad, available []str
} }
} }
for _, name := range modules { for _, name := range modules {
if _, ok := availableSet[name]; !ok { if _, ok := availableSet[name]; !ok && name != MetadataApi {
bad = append(bad, name) bad = append(bad, name)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment