Rename whitelist to allowlist in comments and variables

Co-authored-by: Paul Lange <[email protected]>
celo-org · Aug 21, 2024 · f47600e · f47600e
1 parent 8bf5f3c
commit f47600e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/common/celo_types_test.go b/common/celo_types_test.go
@@ -15,7 +15,7 @@ var (
 	}
 )
 
-func TestIsWhitelisted(t *testing.T) {
+func TestIsCurrencyAllowed(t *testing.T) {
 	tests := []struct {
 		name        string
 		feeCurrency *Address
@@ -40,7 +40,7 @@ func TestIsWhitelisted(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if got := IsCurrencyAllowed(exchangeRates, tt.feeCurrency); got != tt.want {
-				t.Errorf("IsWhitelisted() = %v, want %v", got, tt.want)
+				t.Errorf("IsCurrencyAllowed() = %v, want %v", got, tt.want)
 			}
 		})
 	}

diff --git a/core/celo_multi_gaspool_test.go b/core/celo_multi_gaspool_test.go
@@ -23,7 +23,7 @@ func TestMultiCurrencyGasPool(t *testing.T) {
 		expectedValue       uint64
 	}{
 		{
-			name:                "Empty whitelist, empty mapping, CELO uses default pool",
+			name:                "Empty allowlist, empty mapping, CELO uses default pool",
 			feeCurrency:         nil,
 			allowlist:           []FeeCurrency{},
 			defaultLimit:        0.9,

diff --git a/core/state_transition.go b/core/state_transition.go
@@ -437,8 +437,8 @@ func (st *StateTransition) preCheck() error {
 		} else {
 			isWhiteListed := common.IsCurrencyAllowed(st.evm.Context.FeeCurrencyContext.ExchangeRates, msg.FeeCurrency)
 			if !isWhiteListed {
-				log.Trace("fee currency not whitelisted", "fee currency address", msg.FeeCurrency)
-				return exchange.ErrNonWhitelistedFeeCurrency
+				log.Trace("fee currency not allowed", "fee currency address", msg.FeeCurrency)
+				return exchange.ErrUnregisteredFeeCurrency
 			}
 		}
 	}

diff --git a/core/txpool/legacypool/celo_legacypool.go b/core/txpool/legacypool/celo_legacypool.go
@@ -11,13 +11,13 @@ import (
 // filter Filters transactions from the given list, according to remaining balance (per currency)
 // and gasLimit. Returns drops and invalid txs.
 func (pool *LegacyPool) filter(list *list, addr common.Address, gasLimit uint64) (types.Transactions, types.Transactions) {
-	// CELO: drop all transactions that no longer have a whitelisted currency
-	dropsWhitelist, invalidsWhitelist := list.FilterAllowlisted(pool.feeCurrencyContext.ExchangeRates)
+	// CELO: drop all transactions that no longer have a registered currency
+	dropsAllowlist, invalidsAllowlist := list.FilterAllowlisted(pool.feeCurrencyContext.ExchangeRates)
 	// Check from which currencies we need to get balances
 	currenciesInList := list.FeeCurrencies()
 	drops, invalids := list.Filter(pool.getBalances(addr, currenciesInList), gasLimit)
-	totalDrops := append(dropsWhitelist, drops...)
-	totalInvalids := append(invalidsWhitelist, invalids...)
+	totalDrops := append(dropsAllowlist, drops...)
+	totalInvalids := append(invalidsAllowlist, invalids...)
 	return totalDrops, totalInvalids
 }
 

diff --git a/core/txpool/legacypool/celo_list_test.go b/core/txpool/legacypool/celo_list_test.go
@@ -60,7 +60,7 @@ func TestListFeeCost(t *testing.T) {
 	assert.Equal(t, uint64(20000), list.TotalCostFor(&curr1).Uint64())
 }
 
-func TestFilterWhitelisted(t *testing.T) {
+func TestFilterAllowlisted(t *testing.T) {
 	curr1 := common.HexToAddress("0002")
 	curr2 := common.HexToAddress("0004")
 	curr3 := common.HexToAddress("0006")
@@ -84,7 +84,7 @@ func TestFilterWhitelisted(t *testing.T) {
 	assert.Equal(t, uint64(0), list.TotalCostFor(&curr2).Uint64())
 }
 
-func TestFilterWhitelistedStrict(t *testing.T) {
+func TestFilterAllowlistedStrict(t *testing.T) {
 	curr1 := common.HexToAddress("0002")
 	curr2 := common.HexToAddress("0004")
 	curr3 := common.HexToAddress("0006")