update routing-helpers
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Sep 26, 2018 at 14:01 UTC
ea352f62d0f63f38e6a1f1cb8467bb5dbf3c43b7
3 files changed
+17
-14
core/core.go
+11
-8
@@ -33,6 +33,7 @@ import (
33
metrics "gx/ipfs/QmNn6gcjBXpg8kccr9zEV7UVBpqAw8FZEiQ6DksvzyTQ5K/go-libp2p-metrics"
34
cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
35
quic "gx/ipfs/QmPWMfcxNC7txnUvT21xdivgRJfJ9e7YuC5nCn6JEALFQv/go-libp2p-quic-transport"
36
+ psrouter "gx/ipfs/QmPbLCBNGvyQhs3xK64cbobq7sN1Hdn6Ud9pkhsZME1sqT/go-libp2p-pubsub-router"
37
floodsub "gx/ipfs/QmPbYVFhKxamZAN9MyrQMDeoGYa6zkQkhAPguwFfzxPM1J/go-libp2p-floodsub"
38
u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
39
ic "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
@@ -68,12 +69,11 @@ import (
69
mfs "gx/ipfs/QmahrY1adY4wvtYEtoGjpZ2GUohTyukrkMkwUR9ytRjTG2/go-mfs"
70
peer "gx/ipfs/QmbNepETomvmXfz1X5pHNFD2QuPqnqi47dTd94QJWSorQ3/go-libp2p-peer"
71
merkledag "gx/ipfs/QmcBoNcAP6qDjgRBew7yjvCqHq7p5jMstE44jPUBWBxzsV/go-merkledag"
72
+ rhelpers "gx/ipfs/QmcRdSdYkL17qhuQAibF5D14XdQ1iunvaVnXGjDiQTdRm9/go-libp2p-routing-helpers"
73
bserv "gx/ipfs/QmcRecCZWM2NZfCQrCe97Ch3Givv8KKEP82tGUDntzdLFe/go-blockservice"
74
"gx/ipfs/QmcjwUb36Z16NJkvDX6ccXPqsFswo6AsRXynyXcLLCphV2/go-path/resolver"
75
yamux "gx/ipfs/QmcsgrV3nCAKjiHKZhKVXWc4oY3WBECJCqahXEMpHeMrev/go-smux-yamux"
74
- psrouter "gx/ipfs/Qmd547Rr4cZUEG5ETGHHNgx6xHBY4ee7hB6NAEBw2UWnea/go-libp2p-pubsub-router"
76
ipld "gx/ipfs/QmdDXJs4axxefSPgK6Y1QhpJWKuDPnGJiqgq4uncb4rFHL/go-ipld-format"
76
- rhelpers "gx/ipfs/QmdELF3gxpecwBauFtZBib2fcnEEAbXiTVA1NSWZjf95Tp/go-libp2p-routing-helpers"
77
bstore "gx/ipfs/QmdriVJgKx4JADRgh3cYPXqXmsa1A45SvFki1nDWHhQNtC/go-ipfs-blockstore"
78
p2phost "gx/ipfs/QmeA5hsqgLryvkeyqeQdvGDqurLkYi3XEPLZP3pzuBJXh2/go-libp2p-host"
79
pstore "gx/ipfs/QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st/go-libp2p-peerstore"
@@ -523,14 +523,17 @@ func (n *IpfsNode) startOnlineServicesWithHost(ctx context.Context, host p2phost
523
n.RecordValidator,
524
)
525
n.Routing = rhelpers.Tiered{
526
- // Always check pubsub first.
527
- &rhelpers.Compose{
528
- ValueStore: &rhelpers.LimitedValueStore{
529
- ValueStore: n.PSRouter,
530
- Namespaces: []string{"ipns"},
526
+ Routers: []routing.IpfsRouting{
527
+ // Always check pubsub first.
528
+ &rhelpers.Compose{
529
+ ValueStore: &rhelpers.LimitedValueStore{
530
+ ValueStore: n.PSRouter,
531
+ Namespaces: []string{"ipns"},
532
+ },
533
},
534
+ n.Routing,
535
},
533
- n.Routing,
536
+ Validator: n.RecordValidator,
537
}
538
}
539
package.json
+4
-4
@@ -464,15 +464,15 @@
464
},
465
{
466
"author": "stebalien",
467
- "hash": "Qmd547Rr4cZUEG5ETGHHNgx6xHBY4ee7hB6NAEBw2UWnea",
467
+ "hash": "QmPbLCBNGvyQhs3xK64cbobq7sN1Hdn6Ud9pkhsZME1sqT",
468
"name": "go-libp2p-pubsub-router",
469
- "version": "0.4.3"
469
+ "version": "0.4.5"
470
},
471
{
472
"author": "Stebalien",
473
- "hash": "QmdELF3gxpecwBauFtZBib2fcnEEAbXiTVA1NSWZjf95Tp",
473
+ "hash": "QmcRdSdYkL17qhuQAibF5D14XdQ1iunvaVnXGjDiQTdRm9",
474
"name": "go-libp2p-routing-helpers",
475
- "version": "0.3.2"
475
+ "version": "0.3.4"
476
},
477
{
478
"author": "fsnotify",
test/sharness/t0183-namesys-pubsub.sh
+2
-2
@@ -28,8 +28,8 @@ test_expect_success 'check namesys pubsub state' '
28
29
# These commands are *expected* to fail. We haven't published anything yet.
30
test_expect_success 'subscribe nodes to the publisher topic' '
31
- ipfsi 1 name resolve /ipns/$PEERID_0;
32
- ipfsi 2 name resolve /ipns/$PEERID_0;
31
+ ipfsi 1 name resolve /ipns/$PEERID_0 --timeout=1s;
32
+ ipfsi 2 name resolve /ipns/$PEERID_0 --timeout=1s;
33
true
34
'
35