deals: Upstream bitswap changes

This commit is contained in:
Łukasz Magiera
2019-08-08 19:16:41 +02:00
parent 998597f314
commit b2c3434bcd
5 changed files with 6 additions and 249 deletions
+2 -2
View File
@@ -5,6 +5,7 @@ import (
"context"
"github.com/ipfs/go-bitswap"
"github.com/ipfs/go-bitswap/network"
"github.com/ipfs/go-blockservice"
"github.com/ipfs/go-car"
"github.com/ipfs/go-datastore"
@@ -16,7 +17,6 @@ import (
"github.com/filecoin-project/go-lotus/chain/store"
"github.com/filecoin-project/go-lotus/chain/types"
"github.com/filecoin-project/go-lotus/lib/nsbsnet"
"github.com/filecoin-project/go-lotus/node/modules/dtypes"
"github.com/filecoin-project/go-lotus/node/modules/helpers"
"github.com/filecoin-project/go-lotus/node/repo"
@@ -25,7 +25,7 @@ import (
func ChainExchange(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, rt routing.Routing, bs dtypes.ChainGCBlockstore) dtypes.ChainExchange {
// prefix protocol for chain bitswap
// (so bitswap uses /chain/ipfs/bitswap/1.0.0 internally for chain sync stuff)
bitswapNetwork := nsbsnet.NewFromIpfsHost(host, rt, "/chain")
bitswapNetwork := network.NewFromIpfsHost(host, rt, network.Prefix("/chain"))
exch := bitswap.New(helpers.LifecycleCtx(mctx, lc), bitswapNetwork, bs)
lc.Append(fx.Hook{
OnStop: func(ctx context.Context) error {