Skip to content

Commit

Permalink
fix issue2689 error loading blspass (harmony-one#2695)
Browse files Browse the repository at this point in the history
  • Loading branch information
coolcottontail authored Apr 3, 2020
1 parent 5b7d216 commit 4c15caa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions cmd/harmony/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ func initSetup() {
// maybe request passphrase for bls key.
if *cmkEncryptedBLSKey == "" {
passphraseForBLS()
} else {
// Get aws credentials from stdin prompt
awsSettingString, _ = blsgen.Readln(1 * time.Second)
}

// Configure log parameters
Expand Down Expand Up @@ -657,9 +660,6 @@ func main() {
// build time.
os.Setenv("GODEBUG", "netdns=go")

// Get aws credentials from prompt timeout 1 second if there's no input
awsSettingString, _ = blsgen.Readln(1 * time.Second)

flag.Var(&p2putils.BootNodes, "bootnodes", "a list of bootnode multiaddress (delimited by ,)")
flag.Parse()

Expand Down
1 change: 0 additions & 1 deletion internal/blsgen/lib.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ func LoadAwsCMKEncryptedBLSKey(fileName, awsSettingString string) (*ffi_bls.Secr

// Create KMS service client
svc := kms.New(sess, &aws.Config{
//Region: aws.String("us-east-1"),
Region: aws.String(awsConfig.Region),
Credentials: credentials.NewStaticCredentials(awsConfig.AccessKey, awsConfig.SecretKey, ""),
})
Expand Down

0 comments on commit 4c15caa

Please sign in to comment.