node, rpc: fix error message, ignore engine api in RegisterAPIs

ethereum · Feb 23, 2022 · 77df434 · 77df434
1 parent 0c5bbfc
commit 77df434
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/cmd/clef/main.go b/cmd/clef/main.go
@@ -661,7 +661,7 @@ func signer(c *cli.Context) error {
 		if err != nil {
 			utils.Fatalf("Could not register API: %w", err)
 		}
-		handler := node.NewHTTPHandlerStack(srv, cors, vhosts)
+		handler := node.NewHTTPHandlerStack(srv, cors, vhosts, nil)
 
 		// set port
 		port := c.Int(rpcPortFlag.Name)

diff --git a/node/endpoints.go b/node/endpoints.go
@@ -60,8 +60,10 @@ func checkModuleAvailability(modules []string, apis []rpc.API) (bad, available [
 		}
 	}
 	for _, name := range modules {
-		if _, ok := availableSet[name]; !ok && name != rpc.MetadataApi {
-			bad = append(bad, name)
+		if _, ok := availableSet[name]; !ok {
+			if name != rpc.MetadataApi && name != rpc.EngineApi {
+				bad = append(bad, name)
+			}
 		}
 	}
 	return bad, available

diff --git a/node/node.go b/node/node.go
@@ -352,7 +352,6 @@ func (n *Node) obtainJWTSecret(cliParam string) ([]byte, error) {
 		if len(jwtSecret) == 32 {
 			return jwtSecret, nil
 		}
-		log.Warn("Discarding provided jwt secret", "size", len(jwtSecret))
 	}
 	jwtFile := n.ResolvePath(datadirJWTKey)
 	log.Debug("Reading jwt-key", "path", jwtFile)

diff --git a/rpc/server.go b/rpc/server.go
@@ -26,6 +26,7 @@ import (
 )
 
 const MetadataApi = "rpc"
+const EngineApi = "engine"
 
 // CodecOption specifies which type of messages a codec supports.
 //