fix dht commands when pubsub routing is enabled #5200
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
See: libp2p/go-libp2p-routing-helpers#3 License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
ghost
assigned 
Stebalien
added
need/review
ghost
reviewed
Jul 8, 2018
core/commands/dht.go
Outdated
| res.SetError(ErrNotDHT, cmdkit.ErrNormal) | ||
| return | ||
| } | ||
|
|
There was a problem hiding this comment.
This removed check covers checking for nil too, right? We don't seem to be checking for that anymore. (Same for the other places, if so.)
Instead of checking if Routing is a DHT (because it can now be a tiered router and still contain a DHT), stash the DHT in a separate field in the IPFS node (same as we do with the PSRouter). fixes #5197 License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
whyrusleeping
approved these changes
Jul 9, 2018
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.
Instead of checking if Routing is a DHT (because it can now be a tiered router and still contain a DHT), stash the DHT in a separate field in the IPFS node (same as we do with the PSRouter).
I'd like to find a better way to fix this (hence the TODO) but it's tricky.
fixes #5197
This also fixes provider finding when the pubsub router is enabled: libp2p/go-libp2p-routing-helpers#3 (found by the new DHT sharness test).