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

Test condition MUST REVERT

This commit is contained in:
Samuel Hawksby-Robinson 2020-12-09 14:36:40 +00:00 committed by Andrea Maria Piana
parent 16fecf5520
commit 30c2b64cf5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/geth_backend.go
View File

@ -1109,9 +1109,9 @@ func (b *GethStatusBackend) SelectAccount(loginParams account.LoginParams) error
}
func (b *GethStatusBackend) GetActiveAccount() (*multiaccounts.Account, error) {
if b.account == nil {
return nil, errors.New("master key account is nil in the GetStatusBackend")
}
/*if b.account == nil {
return nil, errors.New("master key account is nil in the GethStatusBackend")
}*/
return b.account, nil
}

2
services/status/api.go
View File

@ -72,7 +72,7 @@ type SignupResponse struct {
// Signup is an implementation of `status_signup` or `web3.status.signup` API
func (api *PublicAPI) Signup(context context.Context, req SignupRequest) (res SignupResponse, err error) {
accountInfo, mnemonic, err := api.s.am.CreateAccount(req.Password)
_, accountInfo, mnemonic, err := api.s.am.CreateAccount(req.Password)
if err != nil {
err = errors.New("could not create the specified account : " + err.Error())
return

3
services/status/service.go
View File

@ -8,6 +8,7 @@ import (
"github.com/ethereum/go-ethereum/rpc"
"github.com/status-im/status-go/account"
"github.com/status-im/status-go/account/generator"
"github.com/status-im/status-go/eth-node/types"
)
@ -23,7 +24,7 @@ type WhisperService interface {
type AccountManager interface {
AddressToDecryptedAccount(string, string) (types.Account, *types.Key, error)
SelectAccount(account.LoginParams) error
CreateAccount(password string) (accountInfo account.Info, mnemonic string, err error)
CreateAccount(password string) (mkInfo generator.IdentifiedAccountInfo, accountInfo account.Info, mnemonic string, err error)
}
// Service represents our own implementation of status status operations.