From 2d227e65ef9189e9e5a155eaedaaccbd48eca771 Mon Sep 17 00:00:00 2001 From: Ignacio Hagopian Date: Wed, 20 Nov 2019 20:30:28 -0300 Subject: [PATCH] threads: explicit connect to peer thread addr (#109) Signed-off-by: jsign --- eventstore/store_test.go | 3 --- threads.go | 12 ++++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/eventstore/store_test.go b/eventstore/store_test.go index 2dde043c..a4a5747e 100644 --- a/eventstore/store_test.go +++ b/eventstore/store_test.go @@ -9,7 +9,6 @@ import ( ds "github.com/ipfs/go-datastore" "github.com/multiformats/go-multiaddr" core "github.com/textileio/go-textile-core/store" - "github.com/textileio/go-textile-threads/util" ) func TestE2EWithThreads(t *testing.T) { @@ -21,7 +20,6 @@ func TestE2EWithThreads(t *testing.T) { defer os.RemoveAll(tmpDir1) ts1, err := DefaultThreadservice(tmpDir1, ProxyPort(0)) checkErr(t, err) - ts1.Bootstrap(util.DefaultBoostrapPeers()) defer ts1.Close() s1, err := NewStore(ts1, WithRepoPath(tmpDir1)) @@ -55,7 +53,6 @@ func TestE2EWithThreads(t *testing.T) { defer os.RemoveAll(tmpDir2) ts2, err := DefaultThreadservice(tmpDir2, ProxyPort(0)) checkErr(t, err) - ts2.Bootstrap(util.DefaultBoostrapPeers()) defer ts2.Close() s2, err := NewStore(ts2, WithRepoPath(tmpDir2)) diff --git a/threads.go b/threads.go index 5e01ff0f..bc45ce95 100644 --- a/threads.go +++ b/threads.go @@ -234,6 +234,18 @@ func (t *threads) AddThread( return } + threadMultiaddr, err := ma.NewComponent("thread", idstr) + if err != nil { + return + } + peerAddr := addr.Decapsulate(threadMultiaddr) + addri, err := peer.AddrInfoFromP2pAddr(peerAddr) + if err != nil { + return + } + if err = t.Host().Connect(ctx, *addri); err != nil { + return + } lgs, err := t.service.getLogs(ctx, id, pid) if err != nil { return