Merge remote-tracking branch 'origin/develop' into stdevMac_t344_add_…

…release_steps
fibercrypto · Mar 12, 2020 · cf93f39 · cf93f39
2 parents efc0a8c + defa7e4
commit cf93f39
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 141 deletions.
diff --git a/src/coin/mocks/PersistibleSet.go b/src/coin/mocks/PersistibleSet.go
diff --git a/src/coin/skycoin/models/wallet.go b/src/coin/skycoin/models/wallet.go
@@ -825,11 +825,7 @@ func NewWalletDirectory(dirPath string) *WalletDirectory {
 type WalletDirectory struct {
 	// Implements WallentEnv interface
 	WalletDir  string
-	wltService core.PersistibleSet
-}
-
-func (wd *WalletDirectory) SetWltService(wltSrv core.PersistibleSet) {
-	wd.wltService = wltSrv
+	wltService *SkycoinLocalWallet
 }
 
 func lookupWallet(env core.WalletEnv, firstAddr string) (core.Wallet, error) {

diff --git a/src/core/wallet.go b/src/core/wallet.go
@@ -24,11 +24,6 @@ type WalletSet interface {
 	SupportedWalletTypes() []string
 }
 
-type PersistibleSet interface {
-	WalletSet
-	WalletStorage
-}
-
 // WalletStorage provides access to the underlying wallets data store
 type WalletStorage interface {
 	// Encrypt protects wallet data using cryptography

diff --git a/src/models/walletsManager.go b/src/models/walletsManager.go
@@ -799,7 +799,6 @@ func (walletM *WalletManager) sendTo(wltId, destinationAddress, amount string) *
 	}
 	logWalletManager.Info("Transaction created")
 	return qTxn
-
 }
 
 func (walletM *WalletManager) signTxn(wltIds, address []string, source string, tmpPwd interface{}, index []int, qTxn *QTransaction) *QTransaction {
@@ -862,7 +861,12 @@ func (walletM *WalletManager) signTxn(wltIds, address []string, source string, t
 			logWalletManager.WithError(err).Warnf("No signer %s for wallet %v", source, wlts[0])
 			return nil
 		}
-		if suid, err := signer.GetSignerUID(); err != nil && wlts[0].GetId() == string(suid) {
+		signerUid, err := signer.GetSignerUID()
+		if err != nil {
+			logWalletManager.WithError(err).Errorln("unable to ger signer uuid")
+			return nil
+		}
+		if wlts[0].GetId() == string(signerUid) {
 			// NOTE the signer is the wallet it self
 			signer = nil
 		}

diff --git a/src/models/walletsModel.go b/src/models/walletsModel.go
@@ -217,8 +217,6 @@ func (walletModel *WalletModel) data(index *core.QModelIndex, role int) *core.QV
 				}
 				return false
 			}
-			// FIXME: consider a double checking here instead of hadHwConnected
-			// be careful this can have a big performance impact
 			return core.NewQVariant1(valInSlice())
 		}
 	case Expand: