From 3526f690478482a02a152988f4d31074c176b136 Mon Sep 17 00:00:00 2001
From: baptiste-b-pegasys
 <85155432+baptiste-b-pegasys@users.noreply.github.com>
Date: Thu, 29 Jul 2021 17:36:15 +0200
Subject: [PATCH] all: remove term "whitelist" in comments and log messages
 (#23294)

---
 build/ci.go      | 2 +-
 core/tx_pool.go  | 4 ++--
 rpc/websocket.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/ci.go b/build/ci.go
index 63dd606321..ca87913eb0 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -450,7 +450,7 @@ func maybeSkipArchive(env build.Environment) {
 		os.Exit(0)
 	}
 	if env.Branch != "master" && !strings.HasPrefix(env.Tag, "v1.") {
-		log.Printf("skipping archive creation because branch %q, tag %q is not on the whitelist", env.Branch, env.Tag)
+		log.Printf("skipping archive creation because branch %q, tag %q is not on the inclusion list", env.Branch, env.Tag)
 		os.Exit(0)
 	}
 }
diff --git a/core/tx_pool.go b/core/tx_pool.go
index c5b6047486..f6228df2fa 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -635,8 +635,8 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
 // pending or queued one, it overwrites the previous transaction if its price is higher.
 //
 // If a newly added transaction is marked as local, its sending account will be
-// whitelisted, preventing any associated transaction from being dropped out of the pool
-// due to pricing constraints.
+// be added to the allowlist, preventing any associated transaction from being dropped
+// out of the pool due to pricing constraints.
 func (pool *TxPool) add(tx *types.Transaction, local bool) (replaced bool, err error) {
 	// If the transaction is already known, discard it
 	hash := tx.Hash()
diff --git a/rpc/websocket.go b/rpc/websocket.go
index ab55ae69c1..afeb4c2081 100644
--- a/rpc/websocket.go
+++ b/rpc/websocket.go
@@ -96,7 +96,7 @@ func wsHandshakeValidator(allowedOrigins []string) func(*http.Request) bool {
 		if _, ok := req.Header["Origin"]; !ok {
 			return true
 		}
-		// Verify origin against whitelist.
+		// Verify origin against allow list.
 		origin := strings.ToLower(req.Header.Get("Origin"))
 		if allowAllOrigins || originIsAllowed(origins, origin) {
 			return true