From 95bbd46eabc5d95d9fb2108ec232dd62df2f44ab Mon Sep 17 00:00:00 2001
From: baptiste-b-pegasys
<85155432+baptiste-b-pegasys@users.noreply.github.com>
Date: Mon, 2 Aug 2021 15:43:01 +0200
Subject: [PATCH] node, cmd/clef: remove term "whitelist" (#23296)
* node: remove term "whitelist"
* include cmd/clef
---
cmd/clef/main.go | 2 +-
node/rpcstack.go | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cmd/clef/main.go b/cmd/clef/main.go
index cd2320518..61d2811f6 100644
--- a/cmd/clef/main.go
+++ b/cmd/clef/main.go
@@ -657,7 +657,7 @@ func signer(c *cli.Context) error {
cors := utils.SplitAndTrim(c.GlobalString(utils.HTTPCORSDomainFlag.Name))
srv := rpc.NewServer()
- err := node.RegisterApisFromWhitelist(rpcAPI, []string{"account"}, srv, false)
+ err := node.RegisterApis(rpcAPI, []string{"account"}, srv, false)
if err != nil {
utils.Fatalf("Could not register API: %w", err)
}
diff --git a/node/rpcstack.go b/node/rpcstack.go
index 19490411b..2c55a070b 100644
--- a/node/rpcstack.go
+++ b/node/rpcstack.go
@@ -280,7 +280,7 @@ func (h *httpServer) enableRPC(apis []rpc.API, config httpConfig) error {
// Create RPC server and handler.
srv := rpc.NewServer()
- if err := RegisterApisFromWhitelist(apis, config.Modules, srv, false); err != nil {
+ if err := RegisterApis(apis, config.Modules, srv, false); err != nil {
return err
}
h.httpConfig = config
@@ -312,7 +312,7 @@ func (h *httpServer) enableWS(apis []rpc.API, config wsConfig) error {
// Create RPC server and handler.
srv := rpc.NewServer()
- if err := RegisterApisFromWhitelist(apis, config.Modules, srv, false); err != nil {
+ if err := RegisterApis(apis, config.Modules, srv, false); err != nil {
return err
}
h.wsConfig = config
@@ -515,20 +515,20 @@ func (is *ipcServer) stop() error {
return err
}
-// RegisterApisFromWhitelist checks the given modules' availability, generates a whitelist based on the allowed modules,
+// RegisterApis checks the given modules' availability, generates an allowlist based on the allowed modules,
// and then registers all of the APIs exposed by the services.
-func RegisterApisFromWhitelist(apis []rpc.API, modules []string, srv *rpc.Server, exposeAll bool) error {
+func RegisterApis(apis []rpc.API, modules []string, srv *rpc.Server, exposeAll bool) error {
if bad, available := checkModuleAvailability(modules, apis); len(bad) > 0 {
log.Error("Unavailable modules in HTTP API list", "unavailable", bad, "available", available)
}
- // Generate the whitelist based on the allowed modules
- whitelist := make(map[string]bool)
+ // Generate the allow list based on the allowed modules
+ allowList := make(map[string]bool)
for _, module := range modules {
- whitelist[module] = true
+ allowList[module] = true
}
// Register all the APIs exposed by the services
for _, api := range apis {
- if exposeAll || whitelist[api.Namespace] || (len(whitelist) == 0 && api.Public) {
+ if exposeAll || allowList[api.Namespace] || (len(allowList) == 0 && api.Public) {
if err := srv.RegisterName(api.Namespace, api.Service); err != nil {
return err
}
--
GitLab