diff options
| author | Felix Lange <fjl@twurst.com> | 2017-01-09 18:16:06 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2017-01-09 23:24:42 +0800 |
| commit | b9b3efb09f9281a5859646d2dcf36b5813132efb (patch) | |
| tree | f9dc8f9d82108b33bec4669b09a99d06d24239a9 /accounts | |
| parent | 0f34d506b5ae9b76de97318c906e56dddd5309f6 (diff) | |
| download | go-tangerine-b9b3efb09f9281a5859646d2dcf36b5813132efb.tar go-tangerine-b9b3efb09f9281a5859646d2dcf36b5813132efb.tar.gz go-tangerine-b9b3efb09f9281a5859646d2dcf36b5813132efb.tar.bz2 go-tangerine-b9b3efb09f9281a5859646d2dcf36b5813132efb.tar.lz go-tangerine-b9b3efb09f9281a5859646d2dcf36b5813132efb.tar.xz go-tangerine-b9b3efb09f9281a5859646d2dcf36b5813132efb.tar.zst go-tangerine-b9b3efb09f9281a5859646d2dcf36b5813132efb.zip | |
all: fix ineffectual assignments and remove uses of crypto.Sha3
go get github.com/gordonklaus/ineffassign
ineffassign .
Diffstat (limited to 'accounts')
| -rw-r--r-- | accounts/abi/bind/base.go | 2 | ||||
| -rw-r--r-- | accounts/accounts_test.go | 6 | ||||
| -rw-r--r-- | accounts/presale.go | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index 7df02e83f..1f11827dd 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -170,7 +170,7 @@ func (c *BoundContract) transact(opts *TransactOpts, contract *common.Address, i if value == nil { value = new(big.Int) } - nonce := uint64(0) + var nonce uint64 if opts.Nonce == nil { nonce, err = c.transactor.PendingNonceAt(ensureContext(opts.Context), opts.From) if err != nil { diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go index 51ca6c256..f276059e2 100644 --- a/accounts/accounts_test.go +++ b/accounts/accounts_test.go @@ -115,6 +115,9 @@ func TestTimedUnlock(t *testing.T) { pass := "foo" a1, err := am.NewAccount(pass) + if err != nil { + t.Fatal(err) + } // Signing without passphrase fails because account is locked _, err = am.Sign(a1.Address, testSigData) @@ -147,6 +150,9 @@ func TestOverrideUnlock(t *testing.T) { pass := "foo" a1, err := am.NewAccount(pass) + if err != nil { + t.Fatal(err) + } // Unlock indefinitely. if err = am.TimedUnlock(a1, pass, 5*time.Minute); err != nil { diff --git a/accounts/presale.go b/accounts/presale.go index bb82821b9..f00b4f502 100644 --- a/accounts/presale.go +++ b/accounts/presale.go @@ -22,6 +22,7 @@ import ( "crypto/sha256" "encoding/hex" "encoding/json" + "errors" "fmt" "github.com/ethereum/go-ethereum/crypto" @@ -53,6 +54,9 @@ func decryptPreSaleKey(fileContent []byte, password string) (key *Key, err error return nil, err } encSeedBytes, err := hex.DecodeString(preSaleKeyStruct.EncSeed) + if err != nil { + return nil, errors.New("invalid hex in encSeed") + } iv := encSeedBytes[:16] cipherText := encSeedBytes[16:] /* |