Fix binaries import for intl languages #216

CarlBeek · 2021-08-30T09:37:45Z

The binaries in dev do not contain the json language files from \intl\, this is not detected in the current tests either as they have access to the .\intl\ files via the python path from which the binaries are run.

Changes

intl files are imported via a check for sys._MEIPASS which means they are now loaded for both the binaries and natively running the python deposit.py
CI tests for binaries are now conduced from a sub-folder so the python path doesn't contain the root directory which contained the intl files

hwwhww · 2021-09-01T16:06:07Z

I'm testing the macOS binary:

./deposit --help
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/new_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/new_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/new_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIYnrETB eth2deposit/intl/en/cli/new_mnemonic.json
Usage: deposit [OPTIONS] COMMAND [ARGS]...

Options:
  --language TEXT  The language you wish to use the CLI in.
  --help           Show this message and exit.

Commands:
  existing-mnemonic  Generate (or recover) keys from an existing mnemonic
  new-mnemonic       Generate a new mnemonic and keys

and

./deposit new-mnemonic --num_validators 1 --chain mainnet

/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/existing_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/new_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/generate_keys.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/new_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/new_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/en/cli/new_mnemonic.json
Please choose your language ['1. العربية', '2. ελληνικά', '3. English', '4. Français', '5. Bahasa melayu', '6. Italiano', '7. 日本語', '8. 한국어', '9. Português do Brasil', '10. român', '11. 简体中文']:  [English]: 7
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/ja/cli/new_mnemonic.json
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/ja/cli/new_mnemonic.json
ニーモニックの言語を選択してください ['1. 简体中文', '2. 繁體中文', '3. čeština', '4. English', '5. Italiano', '6. 한국어', '7. Português', '8. Español']:  [english]: 2
/var/folders/l2/cr5gmc3j7qjf8lx63s4lys400000gn/T/_MEIHKeDWd eth2deposit/intl/ja/cli/generate_keys.json
キーストアを保護するパスワード。eth2 バリデーターをセットアップする際に復号化するためにこれを再入力する必要があります。:

Is it possible to not stdout (or stderr?) the JSON files names?

eth2deposit/utils/file_handling.py

hwwhww

lgtm

eth2deposit/utils/intl.py

Co-authored-by: Hsiao-Wei Wang <[email protected]>

Fix binaries import for intl languages

CarlBeek added 4 commits August 24, 2021 17:55

inlt files run through sys._MEIPASS for binaries

ad9e20f

CI checks binaries in dedicated folder

f4c4b87

copy folders with "-r"

02bf159

Uses Powershells recursive copy

f4d65df

CarlBeek added bug Something isn't working testing labels Aug 30, 2021

CarlBeek requested a review from hwwhww August 30, 2021 09:37

hwwhww reviewed Sep 1, 2021

View reviewed changes

eth2deposit/utils/file_handling.py Outdated Show resolved Hide resolved

hwwhww approved these changes Sep 1, 2021

View reviewed changes

eth2deposit/utils/intl.py Outdated Show resolved Hide resolved

Apply suggestions from code review

2e1427d

Co-authored-by: Hsiao-Wei Wang <[email protected]>

CarlBeek merged commit 65de454 into dev Sep 2, 2021

CarlBeek deleted the binary_import_fix branch September 2, 2021 13:46

CarlBeek mentioned this pull request Feb 2, 2022

Internationalisation release #206

Merged

everhusk pushed a commit to earthwallet/earth-wallet-cli that referenced this pull request Aug 3, 2023

Merge pull request ethereum#216 from ethereum/binary_import_fix

1378131

Fix binaries import for intl languages

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix binaries import for intl languages #216

Fix binaries import for intl languages #216

CarlBeek commented Aug 30, 2021

hwwhww commented Sep 1, 2021 •

edited

Loading

hwwhww left a comment

Fix binaries import for intl languages #216

Fix binaries import for intl languages #216

Conversation

CarlBeek commented Aug 30, 2021

Changes

hwwhww commented Sep 1, 2021 • edited Loading

hwwhww left a comment

Choose a reason for hiding this comment

hwwhww commented Sep 1, 2021 •

edited

Loading