clean code

JustinBeBoy · Mar 29, 2024 · 88ced32 · 88ced32
1 parent a8da03a
commit 88ced32
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 97 deletions.
diff --git a/libwallet/assets/ltc/utils.go b/libwallet/assets/ltc/utils.go
@@ -64,7 +64,6 @@ func (asset *Asset) DeriveAccountXpub(seedMnemonic string, wordSeedType sharedW.
 	} else {
 		seed, err = bip39.EntropyFromMnemonic(seedMnemonic)
 	}
-	// seed, err := walletseed.DecodeUserInput(seedMnemonic)
 	if err != nil {
 		return "", err
 	}

diff --git a/libwallet/assets/wallet/wallet_shared.go b/libwallet/assets/wallet/wallet_shared.go
@@ -2,7 +2,6 @@ package wallet
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -28,8 +27,7 @@ type Wallet struct {
 	db        *storm.DB
 	logDir    string
 
-	EncryptedSeed []byte
-	// SeedType              WordSeedType
+	EncryptedSeed         []byte
 	IsRestored            bool
 	HasDiscoveredAccounts bool
 	PrivatePassphraseType int32
@@ -331,30 +329,27 @@ func CreateNewWallet(pass *AuthInfo, loader loader.AssetLoader,
 	params *InitParams, assetType utils.AssetType,
 ) (*Wallet, error) {
 	if pass.WordSeedType.ToInt() == 0 {
-		return nil, errors.New("Please select word seed type.")
+		return nil, errors.New("please select word seed type.")
 	}
 
 	seed, err := generateSeed(assetType, pass.WordSeedType)
 	if err != nil {
 		return nil, err
 	}
 
-	fmt.Println("-----------generateSeed--------->", seed)
-
 	encryptedSeed, err := encryptWalletSeed([]byte(pass.PrivatePass), seed)
 	if err != nil {
 		return nil, err
 	}
 
 	wallet := &Wallet{
-		Name:          pass.Name,
-		db:            params.DB,
-		dbDriver:      params.DbDriver,
-		rootDir:       params.RootDir,
-		logDir:        params.LogDir,
-		CreatedAt:     time.Now(),
-		EncryptedSeed: encryptedSeed,
-		// SeedType:              pass.WordSeedType,
+		Name:                  pass.Name,
+		db:                    params.DB,
+		dbDriver:              params.DbDriver,
+		rootDir:               params.RootDir,
+		logDir:                params.LogDir,
+		CreatedAt:             time.Now(),
+		EncryptedSeed:         encryptedSeed,
 		PrivatePassphraseType: pass.PrivatePassType,
 		HasDiscoveredAccounts: true,
 		Type:                  assetType,

diff --git a/libwallet/assets/wallet/wallet_utils.go b/libwallet/assets/wallet/wallet_utils.go
@@ -123,8 +123,6 @@ func (wallet *Wallet) DecryptSeed(privatePassphrase string) (string, error) {
 		return "", errors.New(utils.ErrInvalid)
 	}
 
-	fmt.Println("-------EncryptedSeed------>", string(wallet.EncryptedSeed))
-
 	return decryptWalletSeed([]byte(privatePassphrase), wallet.EncryptedSeed)
 }
 
@@ -204,36 +202,17 @@ func generateSeed(assetType utils.AssetType, wordSeedType WordSeedType) (v strin
 		}
 	}
 
-	// Tạo entropy với 128 bits cho 12 từ seed phrase
-	// entropy, err := bip39.NewEntropy(128)
-	// if err != nil {
-	// 	fmt.Println("-----NewEntropy------error---->", err)
-	// 	return "", err
-	// }
-
-	// Create Seed phrase from entropy
-	// seedPhrase, err := bip39.NewMnemonic(entropy)
-	// if err != nil {
-	// 	fmt.Println("-----NewMnemonic------error---->", err)
-	// 	return "", err
-	// }
-
-	// fmt.Println("12 từ seed phrase:", seedPhrase)
-
 	if len(entropy) > 0 {
 		//Use bip39 for 12-word seeds and 24-word seeds
 		if wordSeedType == WordSeed33 {
 			return walletseed.EncodeMnemonic(entropy), nil
-		} else {
-			// Create Seed phrase from entropy
-			seedPhrase, err := bip39.NewMnemonic(entropy)
-			if err != nil {
-				fmt.Println("-----NewMnemonic------error---->", err)
-				return "", err
-			}
-			fmt.Println("12 từ seed phrase:", seedPhrase)
-			return seedPhrase, nil
 		}
+		// Create Seed phrase from entropy
+		seedPhrase, err := bip39.NewMnemonic(entropy)
+		if err != nil {
+			return "", err
+		}
+		return seedPhrase, nil
 	}
 
 	// Execution should never get here but error added as a safeguard to
@@ -247,16 +226,6 @@ func VerifySeed(seedMnemonic string, assetType utils.AssetType, seedType WordSee
 	return err == nil
 }
 
-// func DecodeSeedMnemonic1(seedMnemonic string, assetType utils.AssetType) (hashedSeed []byte, err error) {
-// 	switch assetType {
-// 	case utils.BTCWalletAsset, utils.DCRWalletAsset, utils.LTCWalletAsset:
-// 		hashedSeed, err = bip39.EntropyFromMnemonic(seedMnemonic)
-// 	default:
-// 		err = fmt.Errorf("%v: (%v)", utils.ErrAssetUnknown, assetType)
-// 	}
-// 	return
-// }
-
 func DecodeSeedMnemonic(seedMnemonic string, assetType utils.AssetType, seedType WordSeedType) (hashedSeed []byte, err error) {
 	switch assetType {
 	case utils.BTCWalletAsset, utils.DCRWalletAsset, utils.LTCWalletAsset:

diff --git a/libwallet/dcr.go b/libwallet/dcr.go
@@ -160,7 +160,6 @@ func deriveBIP44AccountXPubsForDCR(seedMnemonic string, wordSeedType sharedW.Wor
 	} else {
 		seed, err = bip39.EntropyFromMnemonic(seedMnemonic)
 	}
-	// seed, err := walletseed.DecodeUserInput(seedMnemonic)
 	if err != nil {
 		return "", "", err
 	}

diff --git a/ui/page/components/seed_restore_page.go b/ui/page/components/seed_restore_page.go
@@ -299,37 +299,6 @@ func (pg *SeedRestore) seedEditorViewDesktop(gtx C) D {
 	return layout.Flex{Axis: layout.Vertical}.Layout(gtx, columnFlexChilds...)
 }
 
-// func (pg *SeedRestore) seedEditorViewDesktop2(gtx C) D {
-// 	inset := layout.Inset{
-// 		Right: values.MarginPadding5,
-// 	}
-// 	return layout.Flex{}.Layout(gtx,
-// 		layout.Flexed(1, func(gtx C) D {
-// 			return inset.Layout(gtx, func(gtx C) D {
-// 				return pg.inputsGroup(gtx, pg.seedList, 7, 0)
-// 			})
-// 		}),
-// 		layout.Flexed(1, func(gtx C) D {
-// 			return inset.Layout(gtx, func(gtx C) D {
-// 				return pg.inputsGroup(gtx, pg.seedList, 7, 1)
-// 			})
-// 		}),
-// 		layout.Flexed(1, func(gtx C) D {
-// 			return inset.Layout(gtx, func(gtx C) D {
-// 				return pg.inputsGroup(gtx, pg.seedList, 7, 2)
-// 			})
-// 		}),
-// 		layout.Flexed(1, func(gtx C) D {
-// 			return inset.Layout(gtx, func(gtx C) D {
-// 				return pg.inputsGroup(gtx, pg.seedList, 6, 3)
-// 			})
-// 		}),
-// 		layout.Flexed(1, func(gtx C) D {
-// 			return pg.inputsGroup(gtx, pg.seedList, 6, 4)
-// 		}),
-// 	)
-// }
-
 func (pg *SeedRestore) seedEditorViewMobile(gtx layout.Context) layout.Dimensions {
 	inset := layout.Inset{
 		Right: values.MarginPadding5,
@@ -343,19 +312,6 @@ func (pg *SeedRestore) seedEditorViewMobile(gtx layout.Context) layout.Dimension
 	)
 }
 
-// func (pg *SeedRestore) inputsGroup(gtx C, l *layout.List, len, startIndex int) D {
-// 	return l.Layout(gtx, len, func(gtx C, i int) D {
-// 		return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
-// 			layout.Rigid(func(gtx C) D {
-// 				return layout.Inset{Bottom: values.MarginPadding5}.Layout(gtx, func(gtx C) D {
-// 					pg.layoutSeedMenu(gtx, i*5+startIndex)
-// 					return pg.seedEditors.editors[i*5+startIndex].Layout(gtx)
-// 				})
-// 			}),
-// 		)
-// 	})
-// }
-
 func (pg *SeedRestore) inputsGroupMobile(gtx layout.Context, l *layout.List, len, startIndex int) layout.Dimensions {
 	return l.Layout(gtx, len, func(gtx C, i int) D {
 		return layout.Flex{Axis: layout.Vertical}.Layout(gtx,