api: Separate the Net interface from Common #6627
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
magik6k
force-pushed
the
feat/split-net-api
branch
from
b0af7d2
to
94bfe71
Compare
magik6k
commented
Jun 29, 2021
| @@ -41,6 +41,7 @@ import ( | |||
| // StorageMiner is a low-level interface to the Filecoin network storage miner node | |||
| type StorageMiner interface { | |||
| Common | |||
| Net | |||
There was a problem hiding this comment.
I don't think we have to do this in initial MRA split PR, but ideally:
- We'd have the miner interface split into more, per service interfaces
- In the API serve logic we'd only construct the RPC server with the services a node actually supports
nonsense
reviewed
Jul 1, 2021
| "github.com/filecoin-project/lotus/node/modules/dtypes" | ||
| "github.com/filecoin-project/lotus/storage" | ||
| "github.com/filecoin-project/lotus/storage/sectorblocks" | ||
| sto "github.com/filecoin-project/specs-storage/storage" | ||
| ) | ||
|
|
||
| type StorageMinerAPI struct { | ||
| common.CommonAPI | ||
| fx.In |
There was a problem hiding this comment.
@magik6k why is this necessary now?
There was a problem hiding this comment.
It's no longer provided by the embedded structs (which Fx apparently was picking up)
There was a problem hiding this comment.
(fx.In embeds dig.In, which is a private interface, so if it was embedded in deeper structs, the parent struct would 'inherit' it)
19 tasks
magik6k
force-pushed
the
feat/split-net-api
branch
2 times, most recently
from
e2cf25a
to
87b1029
Compare
magik6k
force-pushed
the
feat/split-net-api
branch
from
87b1029
to
812dc26
Compare
ZenGround0
approved these changes
Jul 15, 2021
| return a.Host.Network().Connectedness(pid), nil | ||
| } | ||
|
|
||
| func (a *Libp2pNetAPI) NetPubsubScores(context.Context) ([]api.PubsubScore, error) { | ||
| func (a *NetAPI) NetPubsubScores(context.Context) ([]api.PubsubScore, error) { |
There was a problem hiding this comment.
super nit: it would be nice if the order of methods here matched the order of declarations on the Net interface in api_net.go
magik6k
force-pushed
the
feat/split-net-api
branch
from
b85c09b
to
d5c9ccc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This implements the basic separation of the Net api from CommonAPI, which should make it much easier to construct nodes without it
(this is for #6356, but can be merged separately to reduce PR sizes)