finish make ci

diff --git a/blockchain/pseudohsm/keycache.go b/blockchain/pseudohsm/keycache.go
index 89ea603..dd72241 100644 (file)
--- a/blockchain/pseudohsm/keycache.go
+++ b/blockchain/pseudohsm/keycache.go
@@ -189,9 +189,11 @@ func (kc *keyCache) find(xpub XPub) (XPub, error) {
        // if _, ok := xpub.XPub.(edchainkd.XPub); ok {
        fmt.Println("find xpub.XPub:", xpub.XPub)
        fmt.Println("find xpub.XPub type:", reflect.TypeOf(xpub.XPub))
+       if _, ok := xpub.XPub.(edchainkd.XPub); ok {
+               matches = kc.byPubs[xpub.XPub]
+       }
        // matches = kc.byPubs[xpub.XPub]
        fmt.Println("find matches:", matches)
-       // }
 
        for i, v := range matches {
                fmt.Println("find i:", i)

diff --git a/blockchain/pseudohsm/keycache_test.go b/blockchain/pseudohsm/keycache_test.go
index 0e034de..a0a347c 100644 (file)
--- a/blockchain/pseudohsm/keycache_test.go
+++ b/blockchain/pseudohsm/keycache_test.go
@@ -233,11 +233,11 @@ func TestCacheFind(t *testing.T) {
                fmt.Printf("TestCacheFind #%v, a: %v\n", i, a)
        }
 
-       // nomatchKey := XPub{
-       //      Alias: "bm1pu2vmgps4d9e3mrsuzp58w777apky4rjgn5rn9e",
-       //      File:  filepath.Join(dir, "something"),
-       //      XPub:  tmpEdPubkeys(t, r),
-       // }
+       nomatchKey := XPub{
+               Alias: "bm1pu2vmgps4d9e3mrsuzp58w777apky4rjgn5rn9e",
+               File:  filepath.Join(dir, "something"),
+               XPub:  tmpEdPubkeys(t, r),
+       }
        tests := []struct {
                Query      XPub
                WantResult XPub
@@ -249,23 +249,23 @@ func TestCacheFind(t *testing.T) {
                {Query: XPub{File: keys[0].File}, WantResult: keys[0]},
                // by basename
                {Query: XPub{File: filepath.Base(keys[0].File)}, WantResult: keys[0]},
-               // // by file and xpub
-               // {Query: keys[0], WantResult: keys[0]},
-               // // ambiguous xpub, tie resolved by file
-               // {Query: keys[2], WantResult: keys[2]},
-               // // ambiguous xpub error
-               // {
-               //      Query: XPub{XPub: keys[2].XPub},
-               //      WantError: &AmbiguousKeyError{
-               //              Pubkey:  xpubToString(keys[2].XPub),
-               //              Matches: []XPub{keys[2], keys[3]},
-               //      },
-               // },
-               // // no match error
-               // {Query: nomatchKey, WantError: ErrLoadKey},
-               // {Query: XPub{File: nomatchKey.File}, WantError: ErrLoadKey},
-               // {Query: XPub{File: filepath.Base(nomatchKey.File)}, WantError: ErrLoadKey},
-               // {Query: XPub{XPub: nomatchKey.XPub}, WantError: ErrLoadKey},
+               // by file and xpub
+               {Query: keys[0], WantResult: keys[0]},
+               // ambiguous xpub, tie resolved by file
+               {Query: keys[2], WantResult: keys[2]},
+               // ambiguous xpub error
+               {
+                       Query: XPub{XPub: keys[2].XPub},
+                       WantError: &AmbiguousKeyError{
+                               Pubkey:  xpubToString(keys[2].XPub),
+                               Matches: []XPub{keys[2], keys[3]},
+                       },
+               },
+               // no match error
+               {Query: nomatchKey, WantError: ErrLoadKey},
+               {Query: XPub{File: nomatchKey.File}, WantError: ErrLoadKey},
+               {Query: XPub{File: filepath.Base(nomatchKey.File)}, WantError: ErrLoadKey},
+               {Query: XPub{XPub: nomatchKey.XPub}, WantError: ErrLoadKey},
        }
        for i, test := range tests {
                fmt.Println("TestCacheFind testcase:", i)