Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
3526f690
Unverified
Commit
3526f690
authored
Jul 29, 2021
by
baptiste-b-pegasys
Committed by
GitHub
Jul 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
all: remove term "whitelist" in comments and log messages (#23294)
parent
295bc35e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
ci.go
build/ci.go
+1
-1
tx_pool.go
core/tx_pool.go
+2
-2
websocket.go
rpc/websocket.go
+1
-1
No files found.
build/ci.go
View file @
3526f690
...
...
@@ -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
white
list"
,
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
)
}
}
...
...
core/tx_pool.go
View file @
3526f690
...
...
@@ -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
()
...
...
rpc/websocket.go
View file @
3526f690
...
...
@@ -96,7 +96,7 @@ func wsHandshakeValidator(allowedOrigins []string) func(*http.Request) bool {
if
_
,
ok
:=
req
.
Header
[
"Origin"
];
!
ok
{
return
true
}
// Verify origin against
white
list.
// Verify origin against
allow
list.
origin
:=
strings
.
ToLower
(
req
.
Header
.
Get
(
"Origin"
))
if
allowAllOrigins
||
originIsAllowed
(
origins
,
origin
)
{
return
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment