ethwallet: remove self derive methods

Author: pkieltyka

ethtest/testchain.go

@@ -114,7 +114,7 @@ func (c *Testchain) MustWallet(optAccountIndex ...uint32) *ethwallet.Wallet {
 		panic(err)
 	}
 	if len(optAccountIndex) > 0 {
-		_, err = wallet.SelfDeriveAccountIndex(optAccountIndex[0])
+		wallet, _, err = wallet.DeriveFromAccountIndex(optAccountIndex[0])
 		if err != nil {
 			panic(err)
 		}

ethwallet/ethwallet.go

@@ -20,8 +20,8 @@ import (
 
 func DefaultWalletOptions() WalletOptions {
 	return WalletOptions{
-		DerivationPath:             "m/44'/60'/0'/0/0",
 		RandomWalletEntropyBitSize: EntropyBitSize12WordMnemonic,
+		DerivationPath:             "m/44'/60'/0'/0/0",
 	}
 }
 
@@ -31,8 +31,8 @@ type Wallet struct {
 }
 
 type WalletOptions struct {
-	DerivationPath             string
 	RandomWalletEntropyBitSize int
+	DerivationPath             string
 }
 
 func NewWalletFromPrivateKey(hexPrivateKey string) (*Wallet, error) {
@@ -121,82 +121,36 @@ func (w *Wallet) SetProvider(provider *ethrpc.Provider) {
 	w.provider = provider
 }
 
-func (w *Wallet) Transactor(ctx context.Context) (*bind.TransactOpts, error) {
-	var chainID *big.Int
-	if w.provider != nil {
-		var err error
-		chainID, err = w.provider.ChainID(ctx)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return w.TransactorForChainID(chainID)
-}
-
-func (w *Wallet) TransactorForChainID(chainID *big.Int) (*bind.TransactOpts, error) {
-	if chainID == nil {
-		return nil, fmt.Errorf("ethwallet: chainID is required")
-	} else {
-		return bind.NewKeyedTransactorWithChainID(w.hdnode.PrivateKey(), chainID)
-	}
-}
-
-// TODOXXX: deprecate?
-func (w *Wallet) SelfDerivePath(path accounts.DerivationPath) (common.Address, error) {
-	err := w.hdnode.DerivePath(path)
-	if err != nil {
-		return common.Address{}, err
-	}
-	return w.hdnode.Address(), nil
+func (w *Wallet) Address() common.Address {
+	return w.hdnode.Address()
 }
 
-func (w *Wallet) DerivePath(path accounts.DerivationPath) (*Wallet, common.Address, error) {
+func (w *Wallet) DeriveFromPath(derivationPath string) (*Wallet, common.Address, error) {
 	wallet, err := w.Clone()
 	if err != nil {
 		return nil, common.Address{}, err
 	}
-	address, err := wallet.SelfDerivePath(path)
-	return wallet, address, err
-}
-
-func (w *Wallet) SelfDerivePathFromString(path string) (common.Address, error) {
-	err := w.hdnode.DerivePathFromString(path)
-	if err != nil {
-		return common.Address{}, err
-	}
-	return w.hdnode.Address(), nil
-}
-
-func (w *Wallet) DerivePathFromString(path string) (*Wallet, common.Address, error) {
-	wallet, err := w.Clone()
+	err = wallet.hdnode.DerivePathFromString(derivationPath)
 	if err != nil {
 		return nil, common.Address{}, err
 	}
-	address, err := wallet.SelfDerivePathFromString(path)
+	address := wallet.hdnode.Address()
 	return wallet, address, err
 }
 
-func (w *Wallet) SelfDeriveAccountIndex(accountIndex uint32) (common.Address, error) {
-	err := w.hdnode.DeriveAccountIndex(accountIndex)
+func (w *Wallet) DeriveFromAccountIndex(accountIndex uint32) (*Wallet, common.Address, error) {
+	wallet, err := w.Clone()
 	if err != nil {
-		return common.Address{}, err
+		return nil, common.Address{}, err
 	}
-	return w.hdnode.Address(), nil
-}
-
-func (w *Wallet) DeriveAccountIndex(accountIndex uint32) (*Wallet, common.Address, error) {
-	wallet, err := w.Clone()
+	err = wallet.hdnode.DeriveAccountIndex(accountIndex)
 	if err != nil {
 		return nil, common.Address{}, err
 	}
-	address, err := wallet.SelfDeriveAccountIndex(accountIndex)
+	address := wallet.hdnode.Address()
 	return wallet, address, err
 }
 
-func (w *Wallet) Address() common.Address {
-	return w.hdnode.Address()
-}
-
 func (w *Wallet) HDNode() *HDNode {
 	return w.hdnode
 }
@@ -219,6 +173,26 @@ func (w *Wallet) PublicKeyHex() string {
 	return hexutil.Encode(publicKeyBytes)
 }
 
+func (w *Wallet) Transactor(ctx context.Context) (*bind.TransactOpts, error) {
+	var chainID *big.Int
+	if w.provider != nil {
+		var err error
+		chainID, err = w.provider.ChainID(ctx)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return w.TransactorForChainID(chainID)
+}
+
+func (w *Wallet) TransactorForChainID(chainID *big.Int) (*bind.TransactOpts, error) {
+	if chainID == nil {
+		return nil, fmt.Errorf("ethwallet: chainID is required")
+	} else {
+		return bind.NewKeyedTransactorWithChainID(w.hdnode.PrivateKey(), chainID)
+	}
+}
+
 func (w *Wallet) GetBalance(ctx context.Context, optBlockNum ...*big.Int) (*big.Int, error) {
 	var blockNum *big.Int = nil
 	if len(optBlockNum) > 0 {