Skip to content
This repository was archived by the owner on Aug 2, 2021. It is now read-only.

Conversation

@zelig
Copy link
Member

@zelig zelig commented Aug 3, 2019

p2p/testing is maintained by us. At the repo split we forgot to copy it.
It is reinstated under swarm/p2p and imports are corrected throughout the code.

acud
acud previously requested changes Aug 5, 2019
Copy link
Contributor

@acud acud left a comment

Choose a reason for hiding this comment

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

@zelig please use git mv and move the stuff out of the corresponding subdirectory in the vendor/ folder.
after which, please remove the corresponding entry in the vendor.json file.
thanks

@zelig zelig requested a review from acud August 14, 2019 11:49
@zelig
Copy link
Member Author

zelig commented Aug 14, 2019

@zelig please use git mv and move the stuff out of the corresponding subdirectory in the vendor/ folder.

done

after which, please remove the corresponding entry in the vendor.json file.
thanks

i rebased on the new go mod pr so i just ran make vendor

Copy link
Member

@janos janos left a comment

Choose a reason for hiding this comment

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

LGTM

@zelig zelig merged commit 7ee35e3 into master Aug 14, 2019
@acud acud deleted the p2p-testing branch August 16, 2019 03:33
@skylenet skylenet added this to the 0.5.0 milestone Sep 17, 2019
chadsr added a commit to chadsr/swarm that referenced this pull request Sep 23, 2019
* 'master' of github.com:ethersphere/swarm:
  chunk, storage: chunk.Store multiple chunk Put (ethersphere#1681)
  storage: fix pyramid chunker and hasherstore possible deadlocks (ethersphere#1679)
  pss: Use distance to determine single guaranteed recipient (ethersphere#1672)
  storage: fix possible hasherstore deadlock on waitC channel (ethersphere#1674)
  network: Add adaptive capabilities message (ethersphere#1619)
  p2p/protocols, p2p/testing; conditional propagation of context (ethersphere#1648)
  api/http: remove unnecessary conversion (ethersphere#1673)
  storage: fix LazyChunkReader.join potential deadlock (ethersphere#1670)
  HTTP API support for pinning contents (ethersphere#1658)
  pot: Add Distance methods with tests (ethersphere#1621)
  README.md: Update Vendored Dependencies section (ethersphere#1667)
  network, p2p, vendor: move vendored p2p/testing under swarm (ethersphere#1647)
  build, vendor: use go modules for vendoring (ethersphere#1532)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants