refactor: returned interface instead of type struct instance from Acc…

…ountManagerForKeystore()
razor-network · Apr 10, 2024 · 1a93d6c · 1a93d6c
1 parent aa262c6
commit 1a93d6c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/cmd/create.go b/cmd/create.go
@@ -50,7 +50,10 @@ func (*UtilsStruct) Create(password string) (accounts.Account, error) {
 	}
 	log.Debug("Create: .razor directory path: ", razorPath)
 	accountManager, err := razorUtils.AccountManagerForKeystore()
-	utils.CheckError("Error in getting accounts manager for keystore: ", err)
+	if err != nil {
+		log.Error("Error in getting accounts manager for keystore: ", err)
+		return accounts.Account{Address: common.Address{0x00}}, err
+	}
 
 	keystorePath := filepath.Join(razorPath, "keystore_files")
 	account := accountManager.CreateAccount(keystorePath, password)

diff --git a/utils/common.go b/utils/common.go
@@ -390,11 +390,11 @@ func (*UtilsStruct) CheckPassword(account types.Account) error {
 	return nil
 }
 
-func (*UtilsStruct) AccountManagerForKeystore() (*accounts.AccountManager, error) {
+func (*UtilsStruct) AccountManagerForKeystore() (types.AccountManagerInterface, error) {
 	razorPath, err := PathInterface.GetDefaultPath()
 	if err != nil {
 		log.Error("GetKeystorePath: Error in getting .razor path: ", err)
-		return &accounts.AccountManager{}, err
+		return nil, err
 	}
 	keystorePath := filepath.Join(razorPath, "keystore_files")
 

diff --git a/utils/interface.go b/utils/interface.go
@@ -7,7 +7,6 @@ import (
 	"io/fs"
 	"math/big"
 	"os"
-	"razor/accounts"
 	"razor/cache"
 	"razor/core/types"
 	"razor/pkg/bindings"
@@ -157,7 +156,7 @@ type Utils interface {
 	GetStakedTokenManagerWithOpts(client *ethclient.Client, tokenAddress common.Address) (*bindings.StakedToken, bind.CallOpts)
 	GetStakerSRZRBalance(client *ethclient.Client, staker bindings.StructsStaker) (*big.Int, error)
 	CheckPassword(account types.Account) error
-	AccountManagerForKeystore() (*accounts.AccountManager, error)
+	AccountManagerForKeystore() (types.AccountManagerInterface, error)
 }
 
 type EthClientUtils interface {