From 39cc60b8a7d9686e7665b12284b5597a1d8316c2 Mon Sep 17 00:00:00 2001 From: Ivan Tomilov Date: Tue, 24 Oct 2017 19:48:31 +0300 Subject: [PATCH] Fixed make lint --- e2e/accounts/accounts_test.go | 26 +++++++++++++------------- e2e/transactions/transactions_test.go | 8 ++++---- geth/jail/jail.go | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/e2e/accounts/accounts_test.go b/e2e/accounts/accounts_test.go index 59895c002..de7edb907 100644 --- a/e2e/accounts/accounts_test.go +++ b/e2e/accounts/accounts_test.go @@ -137,41 +137,41 @@ func (s *AccountsTestSuite) TestRecoverAccount() { keyStore, err := s.Backend.NodeManager().AccountKeyStore() s.NoError(err) - // create an account + // create an acc address, pubKey, mnemonic, err := s.Backend.AccountManager().CreateAccount(TestConfig.Account1.Password) s.NoError(err) s.T().Logf("Account created: {address: %s, key: %s, mnemonic:%s}", address, pubKey, mnemonic) // try recovering using password + mnemonic addressCheck, pubKeyCheck, err := s.Backend.AccountManager().RecoverAccount(TestConfig.Account1.Password, mnemonic) - s.NoError(err, "recover account failed") + s.NoError(err, "recover acc failed") s.False(address != addressCheck || pubKey != pubKeyCheck, "incorrect accound details recovered") - // now test recovering, but make sure that account/key file is removed i.e. simulate recovering on a new device - account, err := common.ParseAccountString(address) - s.NoError(err, "can not get account from address") + // now test recovering, but make sure that acc/key file is removed i.e. simulate recovering on a new device + acc, err := common.ParseAccountString(address) + s.NoError(err, "can not get acc from address") - account, key, err := keyStore.AccountDecryptedKey(account, TestConfig.Account1.Password) - s.NoError(err, "can not obtain decrypted account key") + acc, key, err := keyStore.AccountDecryptedKey(acc, TestConfig.Account1.Password) + s.NoError(err, "can not obtain decrypted acc key") extChild2String := key.ExtendedKey.String() - s.NoError(keyStore.Delete(account, TestConfig.Account1.Password), "cannot remove account") + s.NoError(keyStore.Delete(acc, TestConfig.Account1.Password), "cannot remove acc") addressCheck, pubKeyCheck, err = s.Backend.AccountManager().RecoverAccount(TestConfig.Account1.Password, mnemonic) - s.NoError(err, "recover account failed (for non-cached account)") + s.NoError(err, "recover acc failed (for non-cached acc)") s.False(address != addressCheck || pubKey != pubKeyCheck, - "incorrect account details recovered (for non-cached account)") + "incorrect acc details recovered (for non-cached acc)") // make sure that extended key exists and is imported ok too - _, key, err = keyStore.AccountDecryptedKey(account, TestConfig.Account1.Password) + _, key, err = keyStore.AccountDecryptedKey(acc, TestConfig.Account1.Password) s.NoError(err) s.Equal(extChild2String, key.ExtendedKey.String(), "CKD#2 key mismatch") // make sure that calling import several times, just returns from cache (no error is expected) addressCheck, pubKeyCheck, err = s.Backend.AccountManager().RecoverAccount(TestConfig.Account1.Password, mnemonic) - s.NoError(err, "recover account failed (for non-cached account)") + s.NoError(err, "recover acc failed (for non-cached acc)") s.False(address != addressCheck || pubKey != pubKeyCheck, - "incorrect account details recovered (for non-cached account)") + "incorrect acc details recovered (for non-cached acc)") // time to login with recovered data whisperService := s.WhisperService() diff --git a/e2e/transactions/transactions_test.go b/e2e/transactions/transactions_test.go index df9f826af..f0dd1a76e 100644 --- a/e2e/transactions/transactions_test.go +++ b/e2e/transactions/transactions_test.go @@ -96,12 +96,12 @@ func (s *TransactionsTestSuite) TestCallRPCSendTransactionUpstream() { var txHash gethcommon.Hash signal.SetDefaultNodeNotificationHandler(func(rawSignal string) { - var signal signal.Envelope - err := json.Unmarshal([]byte(rawSignal), &signal) + var signalEnvelope signal.Envelope + err := json.Unmarshal([]byte(rawSignal), &signalEnvelope) s.NoError(err) - if signal.Type == txqueue.EventTransactionQueued { - event := signal.Event.(map[string]interface{}) + if signalEnvelope.Type == txqueue.EventTransactionQueued { + event := signalEnvelope.Event.(map[string]interface{}) txID := event["id"].(string) // Complete with a wrong passphrase. diff --git a/geth/jail/jail.go b/geth/jail/jail.go index 0dc627274..0caac65db 100644 --- a/geth/jail/jail.go +++ b/geth/jail/jail.go @@ -54,9 +54,9 @@ func (jail *Jail) NewCell(chatID string) (common.JailCell, error) { return nil, ErrInvalidJail } - vm := otto.New() + cellVM := otto.New() - cell, err := newCell(chatID, vm) + cell, err := newCell(chatID, cellVM) if err != nil { return nil, err }