These are chat archives for ethersphere/orange-lounge
ethersphere orange lounge - swarm R & D - https://github.com/ethersphere/swarm/wiki/swarm - https://github.com/ethersphere/swarm/wiki/swarm-dev-progress -- subprojects working groups: https://github.com/ethersphere/swarm/wiki/Working-groups
pssbranch on top of that with all the pss work?
@zelig @lash I have created
swarm-network-rewrite which is now on top of
p2p-simulations-fixes (and so also on top of master).
The code does fail to compile now though:
$ go test -v ./swarm # github.com/ethereum/go-ethereum/swarm/api swarm/api/config.go:48: undefined: network.SyncParams
TestKademliaHiveString fails for me.
the plan is to have the following chain of branches:
p2p-simulations-fixes- currently PR'd as ethereum/go-ethereum#15198
swarm-network-rewrite- the network rewrite including pot, kademlia, hive, dicovery_test etc.
pss- all the pss related changes
Then PR in that order, sounds good?
swarm-network-rewriteand pull in your pss changes, create a single commit
swarm-network-rewritebranch and also not in
git checkout COMMIT swarm/psswill just checkout
swarm/psswith all the changes from COMMIT
so the aim is to manage a
pss branch which we will eventually merge into
master after all the other work.
I was imagining we would push all the changes which have already been reviewed to a
pss branch (on top of
swarm-network-rewrite) and then any pss related changes which haven't yet been reviewed would be PRd into
That way we keep a
pss branch which just has pss related changes which will be ready to PR as soon as
swarm-network-rewrite is merged into master.
Does that make sense?
ethersphere/psscontains all the pss changes now?
so if you want it all reviewed then I suggest pushing
pss back to
swarm-network-rewrite, creating a branch
pss-review at the current commit, then pull requesting
That way, once merged, we'll end up with a reviewed
pss branch on top of
What do you think?
p2p-simulationsis merged, and redo the PR onto that?
@holisticode I reviewed it, we should probably pull request everything but the change to overlay directly to master once this is merged