Skip to content

Commit

Permalink
Variable name collides with pkg name
Browse files Browse the repository at this point in the history
  • Loading branch information
mrz1836 committed Feb 3, 2022
1 parent d73c7c9 commit 65a9cc1
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions examples/private_key_to_wif/private_key_to_wif.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ func main() {
}

// Create a wif
var wif string
if wif, err = bitcoin.PrivateKeyToWifString(privateKey); err != nil {
var privateWif string
if privateWif, err = bitcoin.PrivateKeyToWifString(privateKey); err != nil {
log.Fatalf("error occurred: %s", err.Error())
}

// Success!
log.Printf("private key: %s converted to wif: %s", privateKey, wif)
log.Printf("private key: %s converted to wif: %s", privateKey, privateWif)
}
4 changes: 2 additions & 2 deletions private_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ func PrivateKeyToWif(privateKey string) (*wif.WIF, error) {

// PrivateKeyToWifString will convert a private key to a WIF (string)
func PrivateKeyToWifString(privateKey string) (string, error) {
wif, err := PrivateKeyToWif(privateKey)
privateWif, err := PrivateKeyToWif(privateKey)
if err != nil {
return "", err
}

return wif.String(), nil
return privateWif.String(), nil
}

// WifToPrivateKey will convert a WIF to a private key (*bec.PrivateKey)
Expand Down
24 changes: 12 additions & 12 deletions private_key_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,29 +188,29 @@ func TestPrivateKeyToWif(t *testing.T) {
}

for _, test := range tests {
if wif, err := PrivateKeyToWif(test.input); err != nil && !test.expectedError {
if privateWif, err := PrivateKeyToWif(test.input); err != nil && !test.expectedError {
t.Fatalf("%s Failed: [%s] inputted and error not expected but got: %s", t.Name(), test.input, err.Error())
} else if err == nil && test.expectedError {
t.Fatalf("%s Failed: [%s] inputted and error was expected", t.Name(), test.input)
} else if wif == nil && !test.expectedNil {
} else if privateWif == nil && !test.expectedNil {
t.Fatalf("%s Failed: [%s] inputted and was nil but not expected", t.Name(), test.input)
} else if wif != nil && test.expectedNil {
} else if privateWif != nil && test.expectedNil {
t.Fatalf("%s Failed: [%s] inputted and was NOT nil but expected to be nil", t.Name(), test.input)
} else if wif != nil && wif.String() != test.expectedWif {
t.Fatalf("%s Failed: [%s] inputted [%s] expected but failed comparison of keys, got: %s", t.Name(), test.input, test.expectedWif, wif.String())
} else if privateWif != nil && privateWif.String() != test.expectedWif {
t.Fatalf("%s Failed: [%s] inputted [%s] expected but failed comparison of keys, got: %s", t.Name(), test.input, test.expectedWif, privateWif.String())
}
}

}

// ExamplePrivateKeyToWif example using PrivateKeyToWif()
func ExamplePrivateKeyToWif() {
wif, err := PrivateKeyToWif("54035dd4c7dda99ac473905a3d82f7864322b49bab1ff441cc457183b9bd8abd")
privateWif, err := PrivateKeyToWif("54035dd4c7dda99ac473905a3d82f7864322b49bab1ff441cc457183b9bd8abd")
if err != nil {
fmt.Printf("error occurred: %s", err.Error())
return
}
fmt.Printf("converted wif: %s", wif.String())
fmt.Printf("converted wif: %s", privateWif.String())

// Output:converted wif: 5JTHas7yTFMBLqgFogxZFf8Vc5uKEbkE7yQAQ2g3xPHo2sNG1Ei
}
Expand Down Expand Up @@ -242,25 +242,25 @@ func TestPrivateKeyToWifString(t *testing.T) {
}

for _, test := range tests {
if wif, err := PrivateKeyToWifString(test.input); err != nil && !test.expectedError {
if privateWif, err := PrivateKeyToWifString(test.input); err != nil && !test.expectedError {
t.Fatalf("%s Failed: [%s] inputted and error not expected but got: %s", t.Name(), test.input, err.Error())
} else if err == nil && test.expectedError {
t.Fatalf("%s Failed: [%s] inputted and error was expected", t.Name(), test.input)
} else if wif != test.expectedWif {
t.Fatalf("%s Failed: [%s] inputted [%s] expected but failed comparison of keys, got: %s", t.Name(), test.input, test.expectedWif, wif)
} else if privateWif != test.expectedWif {
t.Fatalf("%s Failed: [%s] inputted [%s] expected but failed comparison of keys, got: %s", t.Name(), test.input, test.expectedWif, privateWif)
}
}

}

// ExamplePrivateKeyToWifString example using PrivateKeyToWifString()
func ExamplePrivateKeyToWifString() {
wif, err := PrivateKeyToWifString("54035dd4c7dda99ac473905a3d82f7864322b49bab1ff441cc457183b9bd8abd")
privateWif, err := PrivateKeyToWifString("54035dd4c7dda99ac473905a3d82f7864322b49bab1ff441cc457183b9bd8abd")
if err != nil {
fmt.Printf("error occurred: %s", err.Error())
return
}
fmt.Printf("converted wif: %s", wif)
fmt.Printf("converted wif: %s", privateWif)

// Output:converted wif: 5JTHas7yTFMBLqgFogxZFf8Vc5uKEbkE7yQAQ2g3xPHo2sNG1Ei
}
Expand Down

0 comments on commit 65a9cc1

Please sign in to comment.