Commit graph

8629 commits

Author SHA1 Message Date
Viktor Trón
a911f75421 Merge pull request #110 from holisticode/nomockdep
p2p/simulations: removed requirement for a mocker from network
2017-07-04 15:33:44 +02:00
Fabio Barone
c47cc688ea p2p/simulations: removed requirement for a mocker from network 2017-06-29 11:23:35 -05:00
Viktor Trón
8bb82d8fef Merge pull request #107 from ethersphere/network-testing-framework-kadfix
swarm/network: kad fixes
2017-06-29 12:57:52 +02:00
Viktor Trón
66f96dad09 Merge pull request #109 from ethersphere/network-testing-framework-events
p2p/simulations: Send current nodes & conns in event stream
2017-06-29 10:14:26 +02:00
Lewis Marshall
4b397c49c5 p2p/simulations: Send current nodes & conns in event stream
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-28 17:59:11 +01:00
Viktor Trón
3946fc3bb3 Merge pull request #108 from ethersphere/network-testing-framework-http
p2p/simulations: Use a single network for the HTTP API
2017-06-28 16:17:01 +02:00
Lewis Marshall
fc904b482c swarm/network: Support disabling discovery for overlay sim
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-27 19:12:43 +01:00
Lewis Marshall
74d40d67b0 p2p/simulations: Only register services once
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-27 19:12:24 +01:00
Lewis Marshall
c8e645817b p2p/simulations: Use a single network for the HTTP API
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-27 18:45:36 +01:00
zelig
c4f33d4ea5 swarm/network: kad fixes
* handleGetPeersMsg Send call async
  * RequestOrder send outside mutex lock scope
2017-06-26 09:15:07 +02:00
Viktor Trón
8863324fff Merge pull request #105 from ethersphere/network-testing-framework-lock-fixes
Prevent various deadlocks
2017-06-25 23:58:35 +02:00
lash
a009ee3d39 swarm/pss: added msg to log, cleared lock error 2017-06-25 15:49:22 +02:00
Lewis Marshall
2b7a3a379b p2p: Prevent blocking on the conn.cont channel
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-25 12:32:54 +02:00
Lewis Marshall
5d8c55b077 p2p/protocols: Wait for handshake to be sent before returning
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-25 12:32:54 +02:00
Lewis Marshall
e145bda359 swarm/network: Fix locking in Healthy
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-25 12:32:54 +02:00
Lewis Marshall
720a11184d p2p/simulations: Improve SimNode locking
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-25 12:32:54 +02:00
Lewis Marshall
5e24e2eb5b p2p/protocols: Improve log messages
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-25 12:32:54 +02:00
Lewis Marshall
4cb8412cd0 Merge pull request #104 from ethersphere/network-testing-framework-psstalk
pss updates + kademlia fixes
2017-06-25 12:24:56 +02:00
lash
0628dbaab9 cmd/swarm: added websocket capability (for pss) 2017-06-24 08:07:57 +02:00
lash
7ab9a617eb swarm, cmd/swarm: PR cleanup, rm obsolete flags 2017-06-23 06:51:30 +02:00
lash
8f141465f2 swarm/pss: added context to runprotocol 2017-06-22 18:02:04 +02:00
lash
62c7a8d6ba swarm/pss: removed useless contexts 2017-06-22 13:00:28 +02:00
lash
e94b1e6bfa swarm/pss: test panic fix, client cancel rm 2017-06-22 12:30:27 +02:00
lash
10adb6e917 swarm, cmd/swarm: Removed websocket opinionation in client constructor
PR cleanup
2017-06-22 10:56:45 +02:00
lash
65023d7d4b swarm, swarm/network, swarm/pss, p2p/simulations: cleanup + doc 2017-06-21 09:36:51 +02:00
zelig
61b45b767a pot, swarm/network: cleanup, fix depth in kad table 2017-06-21 09:36:51 +02:00
zelig
72517463c8 pot, swarm/network: cleanup, fix depth in kad table 2017-06-21 09:36:51 +02:00
nolash
1598e68600 swarm/network: removed debug lines 2017-06-21 09:36:51 +02:00
nolash
1b6f480eba cmd/swarm, swarm/pss: pss snap, docs, pot dup, kad hang
WIP introduce snapshots in pss
cmd can now set websocket host for pss
removed binary log garbage
moved baseaddr get to main pss api
changed pssclient constructor sig to return error
documentation
2017-06-21 09:36:51 +02:00
zelig
a63fec8096 pot, swarm/network: merge bug, kad deadlock 2017-06-21 09:36:51 +02:00
zelig
d3f689a01e potfix 2017-06-21 09:36:51 +02:00
nolash
dca2fd0f0f swarm/pss: newhashaddressfrombytes change 2017-06-21 09:36:51 +02:00
nolash
26d7ceee1f swarm, swarm/network, swarm/pss: debug addr types + pss over devp2p 2017-06-21 09:36:51 +02:00
zelig
82150d65cb swarm/network, pot, swarm/pss: kademlia fixes 2017-06-21 09:36:51 +02:00
zelig
77b5ff3ff1 temp commit, kademlia changes 2017-06-21 09:36:51 +02:00
Lewis Marshall
3899c3e086 Merge pull request #103 from ethersphere/network-testing-framework-p2psim
Simulation framework improvements
2017-06-21 09:34:45 +02:00
Lewis Marshall
ca8421c336 p2p/simulations: Add live node stop events
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-18 16:26:36 +02:00
Lewis Marshall
898f0c1b15 p2p/simulations: Fix the DockerAdapter
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-18 16:13:05 +02:00
Lewis Marshall
9627a75ce0 p2psim: Use explicit flags rather than JSON config
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-18 12:26:47 +02:00
Lewis Marshall
8e17ee44f0 p2psim: Use P2PSIM_NETWORK environment variable
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-18 12:17:21 +02:00
Lewis Marshall
e32197f998 p2p/simulations: Don't log errors for duplicate events
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-18 12:17:21 +02:00
Lewis Marshall
8ac9af986c p2p/simulations: Ensure nodes don't already exist
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-18 12:17:21 +02:00
Lewis Marshall
b56a7fb5ef p2p/simulations/examples: Log errors
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-18 12:17:20 +02:00
Lewis Marshall
be95e9ecb3 p2p/simulations: Set node ID if not set
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-18 12:17:20 +02:00
Lewis Marshall
f079529445 p2p/simulations: Don't disconnect nodes before stopping
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-18 12:14:34 +02:00
Lewis Marshall
5cfb34a151 p2p/simulations: Fix stopping exec nodes
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-18 12:13:49 +02:00
Lewis Marshall
71fb11d6a0 rpc: Fix EthSubscribe
Signed-off-by: Lewis Marshall <lewis@lmars.net>
2017-06-14 11:08:45 +02:00
Viktor Trón
b3557cd6e1 Merge pull request #101 from ethersphere/network-testing-framework-nodepssmerge
swarm/pss: pssclient, pss tests
2017-06-07 10:00:21 +02:00
nolash
339e3c89a7 swarm, swarm/network, swarm/pss, les: fixed swarm bin + minor adj
removed all Pss in symbol names whereever possible (and sensible)

discovery switch in hive now prevents add of suggested peers
this is probably not a permanent solution

bzz and pss now started from swarm.go,
Outputs from bzz/pss Protocols() and APIs()
are appended to the Swarm methods
2017-06-06 22:20:21 +02:00
nolash
1dcc0e3df8 swarm/pss: pssclient, pss tests
reinstated full sim pss core tests
pssclient; p2p/protocols mountable rpc proxy for pss ws)
2017-06-06 14:50:12 +02:00