浏览代码

Apply suggestions from code review

Co-Authored-By: gballet <gballet@gmail.com>
Martin Holst Swende 6 年之前
父节点
当前提交
aae61ab16e
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6 3
      accounts/scwallet/hub.go

+ 6 - 3
accounts/scwallet/hub.go

@@ -87,7 +87,7 @@ type Hub struct {
 
 func (hub *Hub) readPairings() error {
 	hub.pairings = make(map[string]smartcardPairing)
-	pairingFile, err := os.Open(hub.datadir + "/smartcards.json")
+	pairingFile, err := os.Open(filepath.Join(hub.datadir, "smartcards.json"))
 	if err != nil {
 		if os.IsNotExist(err) {
 			return nil
@@ -111,7 +111,7 @@ func (hub *Hub) readPairings() error {
 }
 
 func (hub *Hub) writePairings() error {
-	pairingFile, err := os.OpenFile(hub.datadir+"/smartcards.json", os.O_RDWR|os.O_CREATE, 0755)
+	pairingFile, err := os.OpenFile(filepath.Join(hub.datadir,"smartcards.json"), os.O_RDWR|os.O_CREATE, 0755)
 	if err != nil {
 		return err
 	}
@@ -134,7 +134,10 @@ func (hub *Hub) writePairings() error {
 }
 
 func (hub *Hub) pairing(wallet *Wallet) *smartcardPairing {
-	pairing, ok := hub.pairings[string(wallet.PublicKey)]
+	if pairing, ok := hub.pairings[string(wallet.PublicKey)]; ok{
+		return &pairing
+	}
+	return nil
 	if ok {
 		return &pairing
 	}