Skip to content

Inclusive language#23283

Closed
baptiste-b-pegasys wants to merge 3 commits intoethereum:masterfrom
baptiste-b-pegasys:inclusive-language
Closed

Inclusive language#23283
baptiste-b-pegasys wants to merge 3 commits intoethereum:masterfrom
baptiste-b-pegasys:inclusive-language

Conversation

@baptiste-b-pegasys
Copy link
Copy Markdown
Contributor

I propose some changes on terms to be more inclusive, following this guideline: https://www.aswf.io/blog/inclusive-language/

The biggest impact is the whitelist flag that needs to be deprecated, then removed in a later version.

There are a lot of terms in signer/fourbyte, do you think it could be done in a later PR?

@ligi
Copy link
Copy Markdown
Member

ligi commented Jul 28, 2021

you often change "like crazy" to unpredictably where it is still predictable. Think the meaning is often more like "with high frequency"

@fjl
Copy link
Copy Markdown
Contributor

fjl commented Jul 28, 2021

Some of these changes cannot be made for backwards-compatibility reasons.

@gballet
Copy link
Copy Markdown
Member

gballet commented Jul 28, 2021

Thank you for your PR. Our policy is to strive to use a more inclusive language in our new PRs, while not accepting modification with a large footprint, that do not bring a technical fix and clobber the git history.

I shall also point out that "with a high frequency" does not correctly capture the meaning of "like crazy", as the former incorrectly conveys a meaning of regularity while the latter doesn't. The more correct concept would be "with high intensity". Also, "AllowList" is not grammatically correct: verbs in the infinitive can not function as adjectives. I suggest using the past participle "AllowedList".

@gballet gballet closed this Jul 28, 2021
@baptiste-b-pegasys
Copy link
Copy Markdown
Contributor Author

appart the grammar, what is the suggestion? To split it into small PRs?
or these modifications are bad changes anyway, and it's definitely closed?

@holiman
Copy link
Copy Markdown
Contributor

holiman commented Jul 28, 2021

Yeah I think smaller PRs might be better. Some of them are internal renamings, other actually modify the API.
I'm fine with following the guidelines from https://www.aswf.io/blog/inclusive-language/.

@holiman
Copy link
Copy Markdown
Contributor

holiman commented Jul 28, 2021

The more correct concept would be "with high intensity".

And actually, I think neither "unpredictably" or "with high frequency" or "with high intensity" captures the meaning of "do X like crazy".

@karalabe
Copy link
Copy Markdown
Member

I kind of agree with @gballet here.Clearly care should be taken to avoid potentially problematic phrasings, but I don't really see the point to go and change existing code just to replace wording where there was never any mal-intent.

@holiman
Copy link
Copy Markdown
Contributor

holiman commented Jul 28, 2021

I reviewed it a bit more thoroughly. I think many of the changes were good, even better than the original. Like, "// Don't scan the USB too frequently if the user fetches wallets in a loop" is IMO better than "// Don't scan the USB like crazy it the user fetches wallets in a loop".

I'm thinking that abiding by a set of rules makes things easy.

Copy link
Copy Markdown
Contributor

@holiman holiman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I know it's closed, adding my 5c anyway

Comment thread cmd/utils/flags.go
WhitelistFlag = cli.StringFlag{
DeprecatedAllowListFlag = cli.StringFlag{
Name: "whitelist",
Usage: "[DEPRECATED: you shall replace it by 'allowlist'] Comma separated block number-to-hash mappings to enforce (<number>=<hash>)",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We actually have a system for deprecating flags, making them not appear in the normal listing, but in the extended help.
Also, "you shall" sounds a bit ... dramatic?

Comment thread cmd/utils/flags.go
parts := strings.Split(entry, "=")
if len(parts) != 2 {
Fatalf("Invalid whitelist entry: %s", entry)
Fatalf("Invalid allow list entry: %s", entry)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like it should be one word, "allowlist"

Comment thread core/tx_pool.go
//
// 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
// allowed, preventing any associated transaction from being dropped out of the pool
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not "will be allowed", but "will be added to the allowlist"

Comment thread eth/handler_eth.go
}
// Otherwise if it's a whitelisted block, validate against the set
if want, ok := h.whitelist[headers[0].Number.Uint64()]; ok {
// Otherwise if it's a allowed block, validate against the set
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All blocks are allowed, but only some of them are in the allowList.

Comment thread node/rpcstack.go
}

// RegisterApisFromWhitelist checks the given modules' availability, generates a whitelist based on the allowed modules,
// RegisterApisFromAllowList checks the given modules' availability, generates a allow List based on the allowed modules,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

an allowlist

Comment thread p2p/dial.go
}
if d.netRestrict != nil && !d.netRestrict.Contains(n.IP()) {
return errNotWhitelisted
return errNotAllowedListed
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NotAllowedListed? That's a double tempus form. NotAllowlisted maybe

Comment thread p2p/msgrate/msgrate.go
const ttlScaling = 3

// ttlLimit is the maximum timeout allowance to prevent reaching crazy numbers
// ttlLimit is the maximum timeout allowance to prevent reaching unexpected numbers
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/unexpected/out of bounds

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants