This repository was archived by the owner on Aug 2, 2021. It is now read-only.
pss: Port tests to network/simulation#1682
Merged
nolash merged 3 commits intoethersphere:masterfrom Aug 30, 2019
Merged
Conversation
…hereum's p2p/simulations. protocol_test and handshake_test modified to work with change in setupNetwork function
nolash
suggested changes
Aug 22, 2019
| return adapters.Services{ | ||
| protocolName: func(ctx *adapters.ServiceContext) (node.Service, error) { | ||
| return map[string]simulation.ServiceFunc{ | ||
| "bzz": func(ctx *adapters.ServiceContext, bucket *sync.Map) (s node.Service, cleanup func(), err error) { |
Contributor
There was a problem hiding this comment.
Please don't move blocks of code when making changes in the future. It's easier to compare if you leave them where they are, then we can always reorganize the blocks separately.
pss/handshake_test.go
Outdated
| addrsize, _ = strconv.ParseInt(addrsizestring[1], 10, 0) | ||
|
|
||
| sim := simulation.NewInProc(newServices(false)) | ||
| defer sim.Close() |
Contributor
There was a problem hiding this comment.
The simulation constructor seems to belong inside the setupNetwork
Contributor
Author
|
Pushed commit f607f62 to fix PR review. |
nolash
approved these changes
Aug 26, 2019
chadsr
added a commit
to chadsr/swarm
that referenced
this pull request
Sep 23, 2019
* 'master' of github.com:ethersphere/swarm: pss: Modularize crypto and remove Whisper. Step 1 - isolate whisper code (ethersphere#1698) pss: Improve pressure backstop queue handling - no mutex (ethersphere#1695) cmd/swarm-snapshot: if 2 nodes to create snapshot use connectChain (ethersphere#1709) network: Add API for Capabilities (ethersphere#1675) pss: fixed flaky test that was using a global variable instead of a local one (ethersphere#1702) pss: Port tests to `network/simulation` (ethersphere#1682) storage: fix hasherstore seen check to happen when error is nil (ethersphere#1700) vendor: upgrade go-ethereum to 1.9.2 (ethersphere#1689) bzzeth: initial support for bzz-eth protocol (ethersphere#1571) network/stream: terminate runUpdateSyncing on peer quit (ethersphere#1696) all: first working SWAP version (ethersphere#1554) version: update to v0.5.0 unstable (ethersphere#1694) chunk, storage: storage with multi chunk Set method (ethersphere#1684) chunk, storage: add HasMulti to chunk.Store (ethersphere#1686) chunk, shed, storage: chunk.Store GetMulti method (ethersphere#1691) api, chunk: progress bar support (ethersphere#1649)
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
Because handshake_test.go and protocol_test.go both use a function from pss_test.go that has been modified, both files have some minor changes
There is still a dependency with p2p/simulations/adapters in pss_test.go through the use of the type adapters.serviceContext , this is only used as the type of a function parameter, maybe we could extract this type into network/simulations and refactor its uses
Also, there are more dependencies with p2p/simulations in pss/client and pss/notify, this could be refactored in a future PR
References issue #1652