Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use status-im/whisper module with all changes that we have #1215

Merged
merged 1 commit into from
Oct 3, 2018

Conversation

dshulyak
Copy link
Contributor

@dshulyak dshulyak commented Sep 25, 2018

Using forked whisper version from https://github.com/status-im/whisper

@status-github-bot
Copy link

Pull Request Checklist

  • Have you updated the documentation, if impacted (e.g. docs.status.im)?

@adambabik
Copy link
Contributor

#1184 is merged.

@dshulyak
Copy link
Contributor Author

dshulyak commented Oct 1, 2018

@adambabik thanks, updated

@dshulyak dshulyak changed the title Create status-go/whisperv6 module with all changes that we have Use status-im/whisper module with all changes that we have Oct 1, 2018
@@ -271,17 +271,18 @@ func activateShhService(stack *node.Node, config *params.NodeConfig, db *leveldb
whisperServiceConfig := &whisper.Config{
MaxMessageSize: whisper.DefaultMaxMessageSize,
MinimumAcceptedPOW: 0.001,
TimeSource: time.Now,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it mean that TimeSource in config is unused and can be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in what config? i removed TimeSource from whisper.Config and now it is set with separate method. it was simpler to integrate with tests this way. as for NTPSyncEnabled parameter from status config - it is still used and doesn't need to be removed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i removed TimeSource from whisper.Config

That's what I meant :)

@divan
Copy link
Contributor

divan commented Oct 2, 2018

I still see some references to the previous import:

$ rg -c "go-ethereum/whisper"
Gopkg.lock:1
peers/peerpool_test.go:1
vendor/github.com/ethereum/go-ethereum/mobile/types.go:1
vendor/github.com/ethereum/go-ethereum/mobile/geth.go:1
vendor/github.com/ethereum/go-ethereum/mobile/shhclient.go:2
vendor/github.com/ethereum/go-ethereum/cmd/geth/config.go:1
vendor/github.com/ethereum/go-ethereum/cmd/wnode/main.go:2
vendor/github.com/ethereum/go-ethereum/cmd/utils/flags.go:1
vendor/github.com/ethereum/go-ethereum/swarm/pss/types.go:1
vendor/github.com/ethereum/go-ethereum/swarm/pss/pss.go:1
vendor/github.com/ethereum/go-ethereum/whisper/shhclient/client.go:1
vendor/github.com/ethereum/go-ethereum/whisper/mailserver/mailserver.go:1

peers/peerpool_test.go, probably, the only which should be fixed, but those imports in vendor/ also theoretically can have impact. I think we need to finally solve pruning issue for geth, as those unused packages bring confusion and uncertainity sometimes.

@dshulyak
Copy link
Contributor Author

dshulyak commented Oct 2, 2018

thanks. peers_test was using whisper just for the sake of establishing connection using known protocol. removed that import

@dshulyak dshulyak merged commit 5b551c6 into develop Oct 3, 2018
@adambabik adambabik deleted the move-whisper branch December 27, 2019 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants