Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up goal wallet new output #2183

Merged
merged 5 commits into from
May 26, 2021
Merged

Clean up goal wallet new output #2183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e2feed
apply sed 's/were ommited/were omitted/g' to repo
cce May 24, 2021
67c8b6e
remove ANSI color codes from infoBackupPhrase
cce May 24, 2021
1240ac0
Remove some more "One or more non-printable" mentions from debug/expe…
cce May 24, 2021
82b3ffa
remove ANSI color code from ::AlgorandGoal::CreateWallet WALLET_PASS_…
cce May 25, 2021
469526e
Merge remote-tracking branch 'origin/master' into cleanup-new-wallet-…
cce May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmd/goal/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ const (
errorGenesisIDFail = "Error determining kmd folder (%s). Ensure the node is running in %s."
errorDirectoryNotExist = "Specified directory '%s' does not exist."
errorParseAddr = "Failed to parse addr: %v"
errorNonPrintableCharacters = "One or more non-printable characters were ommited from the following error message:"
infoNonPrintableCharacters = "One or more non-printable characters were ommited from the subsequent line:"
errorNonPrintableCharacters = "One or more non-printable characters were omitted from the following error message:"
infoNonPrintableCharacters = "One or more non-printable characters were omitted from the subsequent line:"

// Account
infoNoAccounts = "Did not find any account. Please import or create a new one."
Expand Down Expand Up @@ -169,6 +169,7 @@ const (
infoCreatedWallet = "Created wallet '%s'"
infoBackupExplanation = "Your new wallet has a backup phrase that can be used for recovery.\nKeeping this backup phrase safe is extremely important.\nWould you like to see it now? (Y/n): "
infoPrintedBackupPhrase = "Your backup phrase is printed below.\nKeep this information safe -- never share it with anyone!"
infoBackupPhrase = "\n%s"
infoNoWallets = "No wallets found. You can create a wallet with `goal wallet new`"
errorCouldntCreateWallet = "Couldn't create wallet: %s"
errorCouldntInitializeWallet = "Couldn't initialize wallet: %s"
Expand Down
24 changes: 0 additions & 24 deletions cmd/goal/messages_common.go
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions cmd/goal/messages_windows.go
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions debug/logfilter/example3.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@



One or more non-printable characters were ommited from the subsequent line:

[32mtest faculty trash brick need involve stand run jelly genius clap business zero ticket head grief rib fox ladder soap injury thrive balance able tissue[0m
test faculty trash brick need involve stand run jelly genius clap business zero ticket head grief rib fox ladder soap injury thrive balance able tissue

WALLET_1_PASSPHRASE: test faculty trash brick need involve stand run jelly genius clap business zero ticket head grief rib fox ladder soap injury thrive balance able tissue
spawn goal wallet list -d /home/travis/gopath/src/github.com/algorand/go-algorand/tmp/out/e2e/103916-1617037129265/tealAndStatefulTealTest/algod/root/Primary/
Expand Down Expand Up @@ -198,9 +196,7 @@



One or more non-printable characters were ommited from the subsequent line:

[32mpowder sing write danger match cabin order oblige shrug slide tragic select true rule gym celery wool vendor salon goat summer rule dove able collect[0m
powder sing write danger match cabin order oblige shrug slide tragic select true rule gym celery wool vendor salon goat summer rule dove able collect

WALLET_2_PASSPHRASE: powder sing write danger match cabin order oblige shrug slide tragic select true rule gym celery wool vendor salon goat summer rule dove able collect
spawn goal wallet list -d /home/travis/gopath/src/github.com/algorand/go-algorand/tmp/out/e2e/103916-1617037129265/tealAndStatefulTealTest/algod/root/Primary/
Expand Down
6 changes: 2 additions & 4 deletions debug/logfilter/example3.out.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@
Your backup phrase is printed below.
Keep this information safe -- never share it with anyone!

One or more non-printable characters were ommited from the subsequent line:
[32mtest faculty trash brick need involve stand run jelly genius clap business zero ticket head grief rib fox ladder soap injury thrive balance able tissue[0m
test faculty trash brick need involve stand run jelly genius clap business zero ticket head grief rib fox ladder soap injury thrive balance able tissue
WALLET_1_PASSPHRASE: test faculty trash brick need involve stand run jelly genius clap business zero ticket head grief rib fox ladder soap injury thrive balance able tissue
spawn goal wallet list -d /home/travis/gopath/src/github.com/algorand/go-algorand/tmp/out/e2e/103916-1617037129265/tealAndStatefulTealTest/algod/root/Primary/
##################################################
Expand All @@ -103,8 +102,7 @@
Your backup phrase is printed below.
Keep this information safe -- never share it with anyone!

One or more non-printable characters were ommited from the subsequent line:
[32mpowder sing write danger match cabin order oblige shrug slide tragic select true rule gym celery wool vendor salon goat summer rule dove able collect[0m
powder sing write danger match cabin order oblige shrug slide tragic select true rule gym celery wool vendor salon goat summer rule dove able collect
WALLET_2_PASSPHRASE: powder sing write danger match cabin order oblige shrug slide tragic select true rule gym celery wool vendor salon goat summer rule dove able collect
spawn goal wallet list -d /home/travis/gopath/src/github.com/algorand/go-algorand/tmp/out/e2e/103916-1617037129265/tealAndStatefulTealTest/algod/root/Primary/
##################################################
Expand Down
9 changes: 3 additions & 6 deletions debug/logfilter/example6.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,8 @@ ok github.com/algorand/go-algorand/test/e2e-go/cli/goal 26.354s



One or more non-printable characters were ommited from the subsequent line:

[32mattract shy usage prison umbrella december sail finish struggle spring walk wisdom bread globe eyebrow admit typical tag december poet labor cable radar absent secret[0mWALLET_1_PASSPHRASE: attract shy usage prison umbrella december sail finish struggle spring walk wisdom bread globe eyebrow admit typical tag december poet labor cable radar absent secret
attract shy usage prison umbrella december sail finish struggle spring walk wisdom bread globe eyebrow admit typical tag december poet labor cable radar absent secret
WALLET_1_PASSPHRASE: attract shy usage prison umbrella december sail finish struggle spring walk wisdom bread globe eyebrow admit typical tag december poet labor cable radar absent secret
spawn goal wallet list -d /home/travis/gopath/src/github.com/algorand/go-algorand/tmp/out/e2e/104122-1617229030279/tealAndStatefulTealTest/algod/root/Primary/

##################################################
Expand Down Expand Up @@ -317,9 +316,7 @@ ok github.com/algorand/go-algorand/test/e2e-go/cli/goal 26.354s



One or more non-printable characters were ommited from the subsequent line:

[32mcasual double chuckle method salmon talent cabbage maze parade luggage under elite pass best session sign december cliff master proud since crunch joy above jump[0m
casual double chuckle method salmon talent cabbage maze parade luggage under elite pass best session sign december cliff master proud since crunch joy above jump

WALLET_2_PASSPHRASE: casual double chuckle method salmon talent cabbage maze parade luggage under elite pass best session sign december cliff master proud since crunch joy above jump
spawn goal wallet list -d /home/travis/gopath/src/github.com/algorand/go-algorand/tmp/out/e2e/104122-1617229030279/tealAndStatefulTealTest/algod/root/Primary/
Expand Down
7 changes: 3 additions & 4 deletions debug/logfilter/example6.out.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ ok github.com/algorand/go-algorand/test/e2e-go/cli/goal 26.354s
Your backup phrase is printed below.
Keep this information safe -- never share it with anyone!

One or more non-printable characters were ommited from the subsequent line:
[32mattract shy usage prison umbrella december sail finish struggle spring walk wisdom bread globe eyebrow admit typical tag december poet labor cable radar absent secret[0mWALLET_1_PASSPHRASE: attract shy usage prison umbrella december sail finish struggle spring walk wisdom bread globe eyebrow admit typical tag december poet labor cable radar absent secret
attract shy usage prison umbrella december sail finish struggle spring walk wisdom bread globe eyebrow admit typical tag december poet labor cable radar absent secret
WALLET_1_PASSPHRASE: attract shy usage prison umbrella december sail finish struggle spring walk wisdom bread globe eyebrow admit typical tag december poet labor cable radar absent secret
spawn goal wallet list -d /home/travis/gopath/src/github.com/algorand/go-algorand/tmp/out/e2e/104122-1617229030279/tealAndStatefulTealTest/algod/root/Primary/
##################################################
Wallet: Wallet_1_1617230151
Expand All @@ -124,8 +124,7 @@ ok github.com/algorand/go-algorand/test/e2e-go/cli/goal 26.354s
Your backup phrase is printed below.
Keep this information safe -- never share it with anyone!

One or more non-printable characters were ommited from the subsequent line:
[32mcasual double chuckle method salmon talent cabbage maze parade luggage under elite pass best session sign december cliff master proud since crunch joy above jump[0m
casual double chuckle method salmon talent cabbage maze parade luggage under elite pass best session sign december cliff master proud since crunch joy above jump
WALLET_2_PASSPHRASE: casual double chuckle method salmon talent cabbage maze parade luggage under elite pass best session sign december cliff master proud since crunch joy above jump
spawn goal wallet list -d /home/travis/gopath/src/github.com/algorand/go-algorand/tmp/out/e2e/104122-1617229030279/tealAndStatefulTealTest/algod/root/Primary/
##################################################
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-go/cli/goal/expect/goalExpectCommon.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ proc ::AlgorandGoal::CreateWallet { WALLET_NAME WALLET_PASSWORD TEST_PRIMARY_NOD
}
expect {
timeout {::AlgorandGoal::Abort "Timed out CreateWallet pass phrase" }
-re {32m([a-z ]+)} {set WALLET_PASS_PHRASE $expect_out(1,string); close;}
-re {([a-z ]+)} {set WALLET_PASS_PHRASE $expect_out(1,string); close;}
}
} EXCEPTION ] } {
::AlgorandGoal::Abort "ERROR in CreateWallet: $EXCEPTION"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e-go/cli/goal/expect/goalFormattingTest.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if { [catch {
spawn goal clerk inspect $TEST_ALGO_DIR/tx
expect {
timeout { close; ::AlgorandGoal::Abort "failed to inspect transaction file within timeout" }
{One or more non-printable characters were ommited from the following error message:} {
{One or more non-printable characters were omitted from the following error message:} {
set NON_PRINTABLE_CHARS_WARNING 1
exp_continue
}
Expand Down