status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed make lint

This commit is contained in:
Ivan Tomilov 2017-10-24 19:48:31 +03:00
parent d1c47c5358
commit 39cc60b8a7
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
e2e/accounts/accounts_test.go
View File

@ -137,41 +137,41 @@ func (s *AccountsTestSuite) TestRecoverAccount() {
keyStore, err := s.Backend.NodeManager().AccountKeyStore() keyStore, err := s.Backend.NodeManager().AccountKeyStore()
s.NoError(err) s.NoError(err)
// create an account // create an acc
address, pubKey, mnemonic, err := s.Backend.AccountManager().CreateAccount(TestConfig.Account1.Password) address, pubKey, mnemonic, err := s.Backend.AccountManager().CreateAccount(TestConfig.Account1.Password)
s.NoError(err) s.NoError(err)
s.T().Logf("Account created: {address: %s, key: %s, mnemonic:%s}", address, pubKey, mnemonic) s.T().Logf("Account created: {address: %s, key: %s, mnemonic:%s}", address, pubKey, mnemonic)
// try recovering using password + mnemonic // try recovering using password + mnemonic
addressCheck, pubKeyCheck, err := s.Backend.AccountManager().RecoverAccount(TestConfig.Account1.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") 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 // now test recovering, but make sure that acc/key file is removed i.e. simulate recovering on a new device
account, err := common.ParseAccountString(address) acc, err := common.ParseAccountString(address)
s.NoError(err, "can not get account from address") s.NoError(err, "can not get acc from address")
account, key, err := keyStore.AccountDecryptedKey(account, TestConfig.Account1.Password) acc, key, err := keyStore.AccountDecryptedKey(acc, TestConfig.Account1.Password)
s.NoError(err, "can not obtain decrypted account key") s.NoError(err, "can not obtain decrypted acc key")
extChild2String := key.ExtendedKey.String() 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) 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, 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 // 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.NoError(err)
s.Equal(extChild2String, key.ExtendedKey.String(), "CKD#2 key mismatch") 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) // 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) 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, 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 // time to login with recovered data
whisperService := s.WhisperService() whisperService := s.WhisperService()

8
e2e/transactions/transactions_test.go
View File

@ -96,12 +96,12 @@ func (s *TransactionsTestSuite) TestCallRPCSendTransactionUpstream() {
var txHash gethcommon.Hash var txHash gethcommon.Hash
signal.SetDefaultNodeNotificationHandler(func(rawSignal string) { signal.SetDefaultNodeNotificationHandler(func(rawSignal string) {
var signal signal.Envelope var signalEnvelope signal.Envelope
err := json.Unmarshal([]byte(rawSignal), &signal) err := json.Unmarshal([]byte(rawSignal), &signalEnvelope)
s.NoError(err) s.NoError(err)
if signal.Type == txqueue.EventTransactionQueued { if signalEnvelope.Type == txqueue.EventTransactionQueued {
event := signal.Event.(map[string]interface{}) event := signalEnvelope.Event.(map[string]interface{})
txID := event["id"].(string) txID := event["id"].(string)
// Complete with a wrong passphrase. // Complete with a wrong passphrase.

4
geth/jail/jail.go
View File

@ -54,9 +54,9 @@ func (jail *Jail) NewCell(chatID string) (common.JailCell, error) {
return nil, ErrInvalidJail return nil, ErrInvalidJail
} }
vm := otto.New() cellVM := otto.New()
cell, err := newCell(chatID, vm) cell, err := newCell(chatID, cellVM)
if err != nil { if err != nil {
return nil, err return nil, err
} }