cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix transitive api dependency on ffi.

Browse Source
This commit is contained in:
Raúl Kripalani 2020-09-14 19:01:35 +01:00
parent 7c13fa95d1
commit 954ff32503
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
markets/loggers/journal.go → markets/journal.go
View File

@ -1,4 +1,4 @@
package marketevents package markets
import ( import (
"github.com/filecoin-project/go-fil-markets/retrievalmarket" "github.com/filecoin-project/go-fil-markets/retrievalmarket"

5
node/modules/client.go
View File

@ -28,6 +28,7 @@ import (
"github.com/filecoin-project/lotus/journal" "github.com/filecoin-project/lotus/journal"
"github.com/filecoin-project/lotus/lib/blockstore" "github.com/filecoin-project/lotus/lib/blockstore"
"github.com/filecoin-project/lotus/markets"
marketevents "github.com/filecoin-project/lotus/markets/loggers" marketevents "github.com/filecoin-project/lotus/markets/loggers"
"github.com/filecoin-project/lotus/markets/retrievaladapter" "github.com/filecoin-project/lotus/markets/retrievaladapter"
"github.com/filecoin-project/lotus/node/impl/full" "github.com/filecoin-project/lotus/node/impl/full"
@ -122,7 +123,7 @@ func StorageClient(lc fx.Lifecycle, h host.Host, ibs dtypes.ClientBlockstore, md
c.SubscribeToEvents(marketevents.StorageClientLogger) c.SubscribeToEvents(marketevents.StorageClientLogger)
evtType := journal.J.RegisterEventType("markets/storage/client", "state_change") evtType := journal.J.RegisterEventType("markets/storage/client", "state_change")
c.SubscribeToEvents(marketevents.StorageClientJournaler(evtType)) c.SubscribeToEvents(markets.StorageClientJournaler(evtType))
return c.Start(ctx) return c.Start(ctx)
}, },
@ -147,7 +148,7 @@ func RetrievalClient(lc fx.Lifecycle, h host.Host, mds dtypes.ClientMultiDstore,
client.SubscribeToEvents(marketevents.RetrievalClientLogger) client.SubscribeToEvents(marketevents.RetrievalClientLogger)
evtType := journal.J.RegisterEventType("markets/retrieval/client", "state_change") evtType := journal.J.RegisterEventType("markets/retrieval/client", "state_change")
client.SubscribeToEvents(marketevents.RetrievalClientJournaler(evtType)) client.SubscribeToEvents(markets.RetrievalClientJournaler(evtType))
return nil return nil
}, },

5
node/modules/storageminer.go
View File

@ -50,6 +50,7 @@ import (
sealing "github.com/filecoin-project/lotus/extern/storage-sealing" sealing "github.com/filecoin-project/lotus/extern/storage-sealing"
"github.com/filecoin-project/lotus/extern/storage-sealing/sealiface" "github.com/filecoin-project/lotus/extern/storage-sealing/sealiface"
"github.com/filecoin-project/lotus/journal" "github.com/filecoin-project/lotus/journal"
"github.com/filecoin-project/lotus/markets"
lapi "github.com/filecoin-project/lotus/api" lapi "github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"
@ -216,7 +217,7 @@ func HandleRetrieval(host host.Host, lc fx.Lifecycle, m retrievalmarket.Retrieva
m.SubscribeToEvents(marketevents.RetrievalProviderLogger) m.SubscribeToEvents(marketevents.RetrievalProviderLogger)
evtType := journal.J.RegisterEventType("markets/retrieval/provider", "state_change") evtType := journal.J.RegisterEventType("markets/retrieval/provider", "state_change")
m.SubscribeToEvents(marketevents.RetrievalProviderJournaler(evtType)) m.SubscribeToEvents(markets.RetrievalProviderJournaler(evtType))
return m.Start() return m.Start()
}, },
@ -234,7 +235,7 @@ func HandleDeals(mctx helpers.MetricsCtx, lc fx.Lifecycle, host host.Host, h sto
h.SubscribeToEvents(marketevents.StorageProviderLogger) h.SubscribeToEvents(marketevents.StorageProviderLogger)
evtType := journal.J.RegisterEventType("markets/storage/provider", "state_change") evtType := journal.J.RegisterEventType("markets/storage/provider", "state_change")
h.SubscribeToEvents(marketevents.StorageProviderJournaler(evtType)) h.SubscribeToEvents(markets.StorageProviderJournaler(evtType))
return h.Start(ctx) return h.Start(ctx)
}, },