aboutsummaryrefslogtreecommitdiffstats
path: root/swarm/network
Commit message (Collapse)AuthorAgeFilesLines
* p2p, swarm: fix node up races by granular locking (#18976)Ferenc Szabo2019-02-195-45/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * swarm/network: DRY out repeated giga comment I not necessarily agree with the way we wait for event propagation. But I truly disagree with having duplicated giga comments. * p2p/simulations: encapsulate Node.Up field so we avoid data races The Node.Up field was accessed concurrently without "proper" locking. There was a lock on Network and that was used sometimes to access the field. Other times the locking was missed and we had a data race. For example: https://github.com/ethereum/go-ethereum/pull/18464 The case above was solved, but there were still intermittent/hard to reproduce races. So let's solve the issue permanently. resolves: ethersphere/go-ethereum#1146 * p2p/simulations: fix unmarshal of simulations.Node Making Node.Up field private in 13292ee897e345045fbfab3bda23a77589a271c1 broke TestHTTPNetwork and TestHTTPSnapshot. Because the default UnmarshalJSON does not handle unexported fields. Important: The fix is partial and not proper to my taste. But I cut scope as I think the fix may require a change to the current serialization format. New ticket: https://github.com/ethersphere/go-ethereum/issues/1177 * p2p/simulations: Add a sanity test case for Node.Config UnmarshalJSON * p2p/simulations: revert back to defer Unlock() pattern for Network It's a good patten to call `defer Unlock()` right after `Lock()` so (new) error cases won't miss to unlock. Let's get back to that pattern. The patten was abandoned in 85a79b3ad3c5863f8612d25c246bcfad339f36b7, while fixing a data race. That data race does not exist anymore, since the Node.Up field got hidden behind its own lock. * p2p/simulations: consistent naming for test providers Node.UnmarshalJSON * p2p/simulations: remove JSON annotation from private fields of Node As unexported fields are not serialized. * p2p/simulations: fix deadlock in Network.GetRandomDownNode() Problem: GetRandomDownNode() locks -> getDownNodeIDs() -> GetNodes() tries to lock -> deadlock On Network type, unexported functions must assume that `net.lock` is already acquired and should not call exported functions which might try to lock again. * p2p/simulations: ensure method conformity for Network Connect* methods were moved to p2p/simulations.Network from swarm/network/simulation. However these new methods did not follow the pattern of Network methods, i.e., all exported method locks the whole Network either for read or write. * p2p/simulations: fix deadlock during network shutdown `TestDiscoveryPersistenceSimulationSimAdapter` often got into deadlock. The execution was stuck on two locks, i.e, `Kademlia.lock` and `p2p/simulations.Network.lock`. Usually the test got stuck once in each 20 executions with high confidence. `Kademlia` was stuck in `Kademlia.EachAddr()` and `Network` in `Network.Stop()`. Solution: in `Network.Stop()` `net.lock` must be released before calling `node.Stop()` as stopping a node (somehow - I did not find the exact code path) causes `Network.InitConn()` to be called from `Kademlia.SuggestPeer()` and that blocks on `net.lock`. Related ticket: https://github.com/ethersphere/go-ethereum/issues/1223 * swarm/state: simplify if statement in DBStore.Put() * p2p/simulations: remove faulty godoc from private function The comment started with the wrong method name. The method is simple and self explanatory. Also, it's private. => Let's just remove the comment. (cherry picked from commit 50b872bf05b8644f14b9bea340092ced6968dd59)
* swarm/storage/netstore: add fetcher cancellation on shutdown (#19049)Elad2019-02-192-119/+125
| | | | | | | swarm/network/stream: remove netstore internal wg swarm/network/stream: run individual tests with t.Run (cherry picked from commit 3ee09ba03511ad9a49e37c58f0c35b9c9771dd6f)
* swarm/network: Saturation check for healthy networks (#19071)holisticode2019-02-194-29/+179
| | | | | | | | | | | | | | | | | | | | | | * swarm/network: new saturation for implementation * swarm/network: re-added saturation func in Kademlia as it is used elsewhere * swarm/network: saturation with higher MinBinSize * swarm/network: PeersPerBin with depth check * swarm/network: edited tests to pass new saturated check * swarm/network: minor fix saturated check * swarm/network/simulations/discovery: fixed renamed RPC call * swarm/network: renamed to isSaturated and returns bool * swarm/network: early depth check (cherry picked from commit 2af24724dd5f3ab1994001854eb32c6a19f9f64a)
* swarm: fix network/stream data races (#19051)Janoš Guljaš2019-02-1912-195/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * swarm/network/stream: newStreamerTester cleanup only if err is nil * swarm/network/stream: raise newStreamerTester waitForPeers timeout * swarm/network/stream: fix data races in GetPeerSubscriptions * swarm/storage: prevent data race on LDBStore.batchesC https://github.com/ethersphere/go-ethereum/issues/1198#issuecomment-461775049 * swarm/network/stream: fix TestGetSubscriptionsRPC data race https://github.com/ethersphere/go-ethereum/issues/1198#issuecomment-461768477 * swarm/network/stream: correctly use Simulation.Run callback https://github.com/ethersphere/go-ethereum/issues/1198#issuecomment-461783804 * swarm/network: protect addrCountC in Kademlia.AddrCountC function https://github.com/ethersphere/go-ethereum/issues/1198#issuecomment-462273444 * p2p/simulations: fix a deadlock calling getRandomNode with lock https://github.com/ethersphere/go-ethereum/issues/1198#issuecomment-462317407 * swarm/network/stream: terminate disconnect goruotines in tests * swarm/network/stream: reduce memory consumption when testing data races * swarm/network/stream: add watchDisconnections helper function * swarm/network/stream: add concurrent counter for tests * swarm/network/stream: rename race/norace test files and use const * swarm/network/stream: remove watchSim and its panic * swarm/network/stream: pass context in watchDisconnections * swarm/network/stream: add concurrent safe bool for watchDisconnections * swarm/storage: fix LDBStore.batchesC data race by not closing it (cherry picked from commit 3fd6db2bf63ce90232de445c7f33943406a5e634)
* swarm: CI race detector test adjustments (#19017)Ferenc Szabo2019-02-193-4/+4
| | | | (cherry picked from commit 27e3f968194e2723279b60f71c79d4da9fc7577f)
* swarm/network: refactor simulation tests bootstrap (#18975)Anton Evangelatov2019-02-199-247/+156
| | | | (cherry picked from commit 597597e8b27ee60a25b4533771702892e72898a5)
* swarm: GetPeerSubscriptions RPC (#18972)holisticode2019-02-193-1/+257
| | | | (cherry picked from commit 43e1b7b124d2bcfba98fbe54972a35c022d85bf2)
* swarm/network, swarm/storage: Preserve opentracing contexts (#19022)lash2019-02-196-90/+99
| | | | (cherry picked from commit 0c10d376066cb7e57d3bfc03f950c7750cd90640)
* swarm/network: fix data race in fetcher_test.go (#18469)Ferenc Szabo2019-02-192-25/+25
| | | | (cherry picked from commit 19bfcbf9117f39f54f698a0953534d90c08e9930)
* swarm/storage: fix test timeout with -race by increasing mget timeoutFerenc Szabo2019-02-191-3/+0
| | | | (cherry picked from commit 1c3aa8d9b12d6104ccddecc1711bc6be2f5b269d)
* swarm: Debug API and HasChunks() API endpoint (#18980)holisticode2019-02-191-0/+5
| | | | (cherry picked from commit 41597c2856d6ac7328baca1340c3e36ab0edd382)
* swarm/network: Remove extra random peer, connect test sanity, comments (#18964)lash2019-02-191-11/+49
| | | | (cherry picked from commit f9401ae011ddf7f8d2d95020b7446c17f8d98dc1)
* swarm: fix flaky delivery tests (#18971)Janoš Guljaš2019-02-192-8/+1
| | | | (cherry picked from commit 592bf6a59cac9697f0491b24e5093cb759d7e44c)
* p2p/testing, swarm: remove unused testing.T in protocol tester (#18500)Elad2019-02-195-31/+31
| | | | (cherry picked from commit 2abeb35d5425d72c2f7fdfe4209f7a94fac52a8e)
* swarm/version: commit version added (#18510)gluk2562019-02-191-0/+4
| | | | (cherry picked from commit ad13d2d407d2f614c39af92430fda0a926da2a8a)
* swarm: bootnode-mode, new bootnodes and no p2p package discovery (#18498)Anton Evangelatov2019-02-195-4/+24
| | | | (cherry picked from commit bbd120354a8d226b446591eeda9f9462cb9b690a)
* swarm/network: fix data race warning on TestBzzHandshakeLightNode (#18459)Elad2019-02-192-6/+13
| | | | (cherry picked from commit 81e26d5a4837077d5fff17e7b461061b134a4a00)
* swarm/network: rewrite of peer suggestion engine, fix skipped tests (#18404)Viktor Trón2019-02-193-667/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * swarm/network: fix skipped tests related to suggestPeer * swarm/network: rename depth to radius * swarm/network: uncomment assertHealth and improve comments * swarm/network: remove commented code * swarm/network: kademlia suggestPeer algo correction * swarm/network: kademlia suggest peer * simplify suggest Peer code * improve peer suggestion algo * add comments * kademlia testing improvements * assertHealth -> checkHealth (test helper) * testSuggestPeer -> checkSuggestPeer (test helper) * remove testSuggestPeerBug and TestKademliaCase * swarm/network: kademlia suggestPeer cleanup, improved comments * swarm/network: minor comment, discovery test default arg (cherry picked from commit bcb2594151c849d65108dd94e54b69067d117d7d)
* cmd/swarm/swarm-snapshot: swarm snapshot generator (#18453)Elad2019-02-192-76/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * cmd/swarm/swarm-snapshot: add binary to create network snapshots * cmd/swarm/swarm-snapshot: refactor and extend tests * p2p/simulations: remove unused triggerChecks func and fix linter * internal/cmdtest: raise the timeout for killing TestCmd * cmd/swarm/swarm-snapshot: add more comments and other minor adjustments * cmd/swarm/swarm-snapshot: remove redundant check in createSnapshot * cmd/swarm/swarm-snapshot: change comment wording * p2p/simulations: revert Simulation.Run from master https://github.com/ethersphere/go-ethereum/pull/1077/files#r247078904 * cmd/swarm/swarm-snapshot: address pr comments * swarm/network/simulations/discovery: removed snapshot write to file * cmd/swarm/swarm-snapshot, swarm/network/simulations: removed redundant connection event check, fixed lint error (cherry picked from commit 34f11e752f61b81c13cdde0649a3c7b14f801c69)
* swarm/network: fix data race in TestNetworkID test (#18460)Janoš Guljaš2019-02-191-5/+4
| | | | (cherry picked from commit 96c7c18b184ae894f1c6bd5fbfc45fbcfa9ace77)
* swarm/pot: each() functions refactored (#18452)gluk2562019-01-151-9/+9
|
* Stream subscriptions (#18355)holisticode2019-01-115-320/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | * swarm/network: eachBin now starts at kaddepth for nn * swarm/network: fix Kademlia.EachBin * swarm/network: fix kademlia.EachBin * swarm/network: correct EachBin implementation according to requirements * swarm/network: less addresses simplified tests * swarm: calc kad depth outside loop in EachBin test * swarm/network: removed printResults * swarm/network: cleanup imports * swarm/network: remove kademlia.EachBin; fix RequestSubscriptions and add unit test * swarm/network/stream: address PR comments * swarm/network/stream: package-wide subscriptionFunc * swarm/network/stream: refactor to kad.EachConn
* p2p/simulations: eliminate concept of pivot (#18426)Ferenc Szabo2019-01-113-60/+1
|
* swarm/network: Rename minproxbinsize, add as member of simulation (#18408)lash2019-01-1015-79/+88
| | | | | | * swarm/network: Rename minproxbinsize, add as member of simulation * swarm/network: Deactivate WaitTillHealthy, unreliable pending suggestpeer
* swarm/network: remove isproxbin bool from kad.Each* iterfunc (#18239)Viktor Trón2019-01-108-31/+21
| | | | | | * swarm/network, swarm/pss: remove isproxbin bool from kad.Each* iterfunc * swarm/network: restore comment and unskip snapshot sync tests
* swarm: Fix T.Fatal inside a goroutine in tests (#18409)Janoš Guljaš2019-01-096-29/+84
| | | | | | | | | | | | * swarm/storage: fix T.Fatal inside a goroutine * swarm/network/simulation: fix T.Fatal inside a goroutine * swarm/network/stream: fix T.Fatal inside a goroutine * swarm/network/simulation: consistent failures in TestPeerEventsTimeout * swarm/network/simulation: rename sendRunSignal to triggerSimulationRun
* swarm, p2p/protocols: Stream accounting (#18337)holisticode2019-01-082-30/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * swarm: completed 1st phase of swap accounting * swarm, p2p/protocols: added stream pricing * swarm/network/stream: gofmt simplify stream.go * swarm: fixed review comments * swarm: used snapshots for swap tests * swarm: custom retrieve for swap (less cascaded requests at any one time) * swarm: addressed PR comments * swarm: log output formatting * swarm: removed parallelism in swap tests * swarm: swap tests simplification * swarm: removed swap_test.go * swarm/network/stream: added prefix space for comments * swarm/network/stream: unit test for prices * swarm/network/stream: don't hardcode price * swarm/network/stream: fixed invalid price check
* A few minor code inspection fixes (#18393)Ferenc Szabo2019-01-068-27/+27
| | | | | | | | | | | | | | | | * swarm/network: fix code inspection problems - typos - redundant import alias * p2p/simulations: fix code inspection problems - typos - unused function parameters - redundant import alias - code style issue: snake case * swarm/network: fix unused method parameters inspections
* vendor, crypto, swarm: switch over to upstream sha3 packageDave McGregor2019-01-041-1/+1
|
* swarm: remove unused/dead code (#18351)Anton Evangelatov2018-12-246-100/+3
|
* swarm/network: Revised depth and health for Kademlia (#18354)lash2018-12-2213-271/+412
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * swarm/network: Revised depth calculation with tests * swarm/network: WIP remove redundant "full" function * swarm/network: WIP peerpot refactor * swarm/network: Make test methods submethod of peerpot and embed kad * swarm/network: Remove commented out code * swarm/network: Rename health test functions * swarm/network: Too many n's * swarm/network: Change hive Healthy func to accept addresses * swarm/network: Add Healthy proxy method for api in hive * swarm/network: Skip failing test out of scope for PR * swarm/network: Skip all tests dependent on SuggestPeers * swarm/network: Remove commented code and useless kad Pof member * swarm/network: Remove more unused code, add counter on depth test errors * swarm/network: WIP Create Healthy assertion tests * swarm/network: Roll back health related methods receiver change * swarm/network: Hardwire network minproxbinsize in swarm sim * swarm/network: Rework Health test to strict Pending add test for saturation And add test for as many as possible up to saturation * swarm/network: Skip discovery tests (dependent on SuggestPeer) * swarm/network: Remove useless minProxBinSize in stream * swarm/network: Remove unnecessary testing.T param to assert health * swarm/network: Implement t.Helper() in checkHealth * swarm/network: Rename check back to assert now that we have helper magic * swarm/network: Revert WaitTillHealthy change (deferred to nxt PR) * swarm/network: Kademlia tests GotNN => ConnectNN * swarm/network: Renames and comments * swarm/network: Add comments
* p2p/simulation: Test snapshot correctness and minimal benchmark (#18287)lash2018-12-211-26/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p2p/simulation: WIP minimal snapshot test * p2p/simulation: Add snapshot create, load and verify to snapshot test * build: add test tag for tests * p2p/simulations, build: Revert travis change, build test sym always * p2p/simulations: Add comments, timeout check on additional events * p2p/simulation: Add benchmark template for minimal peer protocol init * p2p/simulations: Remove unused code * p2p/simulation: Correct timer reset * p2p/simulations: Put snapshot check events in buffer and call blocking * p2p/simulations: TestSnapshot fail if Load function returns early * p2p/simulations: TestSnapshot wait for all connections before returning * p2p/simulation: Revert to before wait for snap load (5e75594) * p2p/simulations: add "conns after load" subtest to TestSnapshot and nudge
* swarm/network/simulation:commented out unreachable code-avoid vet errors ↵Javier Peletier2018-12-181-7/+4
| | | | (#18263)
* Update visualized snapshot test (#18286)holisticode2018-12-181-53/+214
| | | | | | | | | | | | * swarm/network/stream: fix visualized_snapshot_sync_sim_test * swarm/network/stream: updated visualized snapshot-test;data in p2p event * swarm/network/stream: cleanup visualized snapshot sync test * swarm/network/stream: re-enable t.Skip for visualized test * swarm/network/stream: addressed PR comments
* p2p/simulation: move connection methods from swarm/network/simulation (#18323)Elad2018-12-1711-535/+37
|
* swarm/network: Correct ambiguity in compared addresses (#18251)lash2018-12-101-2/+1
|
* swarm: snapshot load improvement (#18220)Janoš Guljaš2018-12-072-2/+1
| | | | | | | | | | | | | | | | | | * swarm/network: Hive - do not notify peer if discovery is disabled * p2p/simulations: validate all connections on loading a snapshot * p2p/simulations: track all connections in on snapshot loading * p2p/simulations: add snapshotLoadTimeout variable * p2p/simulations: ignore control events in snapshot load * p2p/simulations: simplify event loop synchronization * p2p/simulations: return already connected error from Load function * p2p/simulations: log warning on snapshot loading disconnection
* swarm/network/stream: Debug log instead of Warn for retrieval failure (#18246)holisticode2018-12-051-1/+3
|
* Increase bzz version (#18184)holisticode2018-11-273-3/+170
| | | | | | | | * swarm/network/stream/: added stream protocol version match tests * Increase BZZ version due to streamer version change; version tests * swarm/network: increased hive and test protocol version
* swarm/network: Correct neighborhood depth (#18066)lash2018-11-2711-37/+207
|
* swarm/pss: Message handler refactor (#18169)lash2018-11-261-9/+17
|
* swarm/network/simulation: fix New function for-loop scope (#18161)Janoš Guljaš2018-11-264-1/+56
|
* swarm/network/stream: use swarm/mock/mem as mock global store (#18157)Janoš Guljaš2018-11-223-53/+11
|
* swarm/state: refactor InmemoryStore (#18143)Anton Evangelatov2018-11-212-3/+3
|
* Swarm accounting (#18050)holisticode2018-11-167-35/+61
| | | | | | | | | | | | | | | | * swarm: completed 1st phase of swap accounting * swarm: swap accounting for swarm with p2p accounting * swarm/swap: addressed PR comments * swarm/swap: ignore ErrNotFound on stateStore.Get() * swarm/swap: GetPeerBalance test; add TODO for chequebook API check * swarm/network/stream: fix NewRegistry calls with new arguments * swarm/swap: address @justelad's PR comments
* swarm/network/simulation: use simulations.Event instead p2p.PeerEvent (#18098)Janoš Guljaš2018-11-166-55/+101
|
* cmd/swarm, swarm/api/http, swarm/bmt, swarm/fuse, swarm/network/stream, ↵Alexey Sharov2018-11-145-20/+12
| | | | | | swarm/storage, swarm/storage/encryption, swarm/testutil: use pseudo-random instead of crypto-random for test files content generation (#18083) - Replace "crypto/rand" to "math/rand" for files content generation - Remove swarm/network_test.go.Shuffle and swarm/btm/btm_test.go.Shuffle - because go1.9 support dropped (see https://github.com/ethereum/go-ethereum/pull/17807 and comments to swarm/network_test.go.Shuffle)
* p2p/simulations, swarm/network: Custom services in snapshot (#17991)lash2018-11-121-6/+25
| | | | | | | | | | | | | | | | | | | | * p2p/simulations: Add custom services to simnodes + remove sim down conn objs * p2p/simulation, swarm/network: Add selective services to discovery sim * p2p/simulations, swarm/network: Remove useless comments * p2p/simulations, swarm/network: Clean up mess from rebase * p2p/simulation: Add sleep to prevent connect flakiness in http test * p2p/simulations: added concurrent goroutines to prevent sleeps on simulation connect/disconnect * p2p/simulations, swarm/network/simulations: address pr comments * reinstated dummy service * fixed http snapshot test
* swarm, cmd/swarm: address ineffectual assignments (#18048)Anton Evangelatov2018-11-084-13/+12
| | | | | | | | * swarm, cmd/swarm: address ineffectual assignments * swarm/network: remove unused vars from testHandshake * swarm/storage/feed: revert cursor changes
* swarm/network: light nodes are not dialed, saved and requested from (#17975)Mark Vujevits2018-11-084-13/+153
| | | | | | | | | | | | | | | | * RequestFromPeers does not use peers marked as lightnode * fix warning about variable name * write tests for RequestFromPeers * lightnodes should be omitted from the addressbook * resolve pr comments regarding logging, formatting and comments * resolve pr comments regarding comments and added a missing newline * add assertions to check peers in live connections
* swarm: Better syncing and retrieval option definition (#17986)holisticode2018-11-078-51/+134
| | | | | | | | * swarm: Better syncing and retrieval option definition * swarm/network/stream: better comments * swarm/network/stream: addressed PR comments
* swarm: clean up unused private types and functions (#17989)Ferenc Szabo2018-10-271-4/+0
| | | | | | | | | | | * swarm: clean up unused private types and functions Those that were identified by code inspection tool. * swarm/storage: move/add Proximity GoDoc from deleted private function The mentioned proximity() private function was deleted in: 1ca8fc1e6fa0ab4ab1aaca06d6fb32e173cd5f2f
* swarm/network/stream: disambiguate chunk delivery messages (retrieval… ↵holisticode2018-10-214-12/+47
| | | | | | | | | | (#17920) * swarm/network/stream: disambiguate chunk delivery messages (retrieval vs syncing) * swarm/network/stream: addressed PR comments * swarm/network/stream: stream protocol version change due to new message types in this PR
* swarm/network: disallow historical retrieval requests (#17936)Elad2018-10-195-7/+11
|
* swarm: Lightnode mode: disable sync, retrieve, subscription (#17899)Attila Gazso2018-10-186-13/+252
| | | | | | | | | | | | * swarm: Lightnode mode: disable sync, retrieve, subscription * swarm/network/stream: assign error and check in one line * swarm: restructured RegistryOption initializing * swarm: empty commit to retrigger CI build * swarm/network/stream: Added comments explaining RegistryOptions
* swarm/network/stream: generalise setting of next batch (#17818)Viktor Trón2018-10-127-77/+89
| | | | | | | | * swarm/network/stream: generalize SetNextBatch and add Server SessionIndex * swarm/network/stream: fix a typo in comment * swarm/network/stream: remove live argument from NewSwarmSyncerServer
* p2p/simulations: fix a deadlock and clean up adapters (#17891)Felix Lange2018-10-121-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a rare deadlock with the inproc adapter: - A node is stopped, which acquires Network.lock. - The protocol code being simulated (swarm/network in my case) waits for its goroutines to shut down. - One of those goroutines calls into the simulation to add a peer, which waits for Network.lock. The fix for the deadlock is really simple, just release the lock before stopping the simulation node. Other changes in this PR clean up the exec adapter so it reports node startup errors better and remove the docker adapter because it just adds overhead. In the exec adapter, node information is now posted to a one-shot server. This avoids log parsing and allows reporting startup errors to the simulation host. A small change in package node was needed because simulation nodes use port zero. Node.{HTTP,WS}Endpoint now return the live endpoints after startup by checking the TCP listener.
* Fix retrieval tests and simulation backends (#17723)holisticode2018-10-094-221/+388
| | | | | | | | | | | | | | | | | | | | * swarm/network/stream: introduced visualized snapshot sync test * swarm/network/stream: non-existing hash visualization sim * swarm/network/stream: fixed retrieval tests; new backend for visualization * swarm/network/stream: cleanup of visualized_snapshot_sync_sim_test.go * swarm/network/stream: rebased PR on master * swarm/network/stream: fixed loop logic in retrieval tests * swarm/network/stream: fixed iterations for snapshot tests * swarm/network/stream: address PR comments * swarm/network/stream: addressed PR comments
* swarm/storage/feeds: removed capital Feed throughoutJavier Peletier2018-10-031-2/+2
|
* swarm/storage/mru: Renamed rest of MRU referencesJavier Peletier2018-10-031-1/+1
|
* swarm/storage/mru: Renamed all identifiers to FeedsJavier Peletier2018-10-031-1/+1
|
* Merge branch 'master' into max-stream-peer-serversJanos Guljas2018-09-276-31/+146
|\
| * Merge pull request #17757 from ethersphere/retrieve-request-ttl-prViktor Trón2018-09-274-22/+64
| |\ | | | | | | swarm: prevent forever running retrieve request loops
| | * swarm: prevent forever running retrieve request loopsBalint Gabor2018-09-264-22/+64
| | |
| * | Merge pull request #17734 from frncmx/fix-dos-attack-invalid-hash-lengthViktor Trón2018-09-262-9/+82
| |\ \ | | |/ | |/| swarm/network/stream: fix DoS invalid offered hashes length
| | * swarm/network/stream: fix DoS invalid hash length (#927)Ferenc Szabo2018-09-212-9/+82
| | |
* | | swarm/network/stream: fix a typo in test commentJanos Guljas2018-09-261-1/+1
| | |
* | | Merge branch 'master' into max-stream-peer-serversJanos Guljas2018-09-2542-414/+400
|\| |
| * | all: new p2p node representation (#17643)Felix Lange2018-09-2541-403/+389
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Package p2p/enode provides a generalized representation of p2p nodes which can contain arbitrary information in key/value pairs. It is also the new home for the node database. The "v4" identity scheme is also moved here from p2p/enr to remove the dependency on Ethereum crypto from that package. Record signature handling is changed significantly. The identity scheme registry is removed and acceptable schemes must be passed to any method that needs identity. This means records must now be validated explicitly after decoding. The enode API is designed to make signature handling easy and safe: most APIs around the codebase work with enode.Node, which is a wrapper around a valid record. Going from enr.Record to enode.Node requires a valid signature. * p2p/discover: port to p2p/enode This ports the discovery code to the new node representation in p2p/enode. The wire protocol is unchanged, this can be considered a refactoring change. The Kademlia table can now deal with nodes using an arbitrary identity scheme. This requires a few incompatible API changes: - Table.Lookup is not available anymore. It used to take a public key as argument because v4 protocol requires one. Its replacement is LookupRandom. - Table.Resolve takes *enode.Node instead of NodeID. This is also for v4 protocol compatibility because nodes cannot be looked up by ID alone. - Types Node and NodeID are gone. Further commits in the series will be fixes all over the the codebase to deal with those removals. * p2p: port to p2p/enode and discovery changes This adapts package p2p to the changes in p2p/discover. All uses of discover.Node and discover.NodeID are replaced by their equivalents from p2p/enode. New API is added to retrieve the enode.Node instance of a peer. The behavior of Server.Self with discovery disabled is improved. It now tries much harder to report a working IP address, falling back to 127.0.0.1 if no suitable address can be determined through other means. These changes were needed for tests of other packages later in the series. * p2p/simulations, p2p/testing: port to p2p/enode No surprises here, mostly replacements of discover.Node, discover.NodeID with their new equivalents. The 'interesting' API changes are: - testing.ProtocolSession tracks complete nodes, not just their IDs. - adapters.NodeConfig has a new method to create a complete node. These changes were needed to make swarm tests work. Note that the NodeID change makes the code incompatible with old simulation snapshots. * whisper/whisperv5, whisper/whisperv6: port to p2p/enode This port was easy because whisper uses []byte for node IDs and URL strings in the API. * eth: port to p2p/enode Again, easy to port because eth uses strings for node IDs and doesn't care about node information in any way. * les: port to p2p/enode Apart from replacing discover.NodeID with enode.ID, most changes are in the server pool code. It now deals with complete nodes instead of (Pubkey, IP, Port) triples. The database format is unchanged for now, but we should probably change it to use the node database later. * node: port to p2p/enode This change simply replaces discover.Node and discover.NodeID with their new equivalents. * swarm/network: port to p2p/enode Swarm has its own node address representation, BzzAddr, containing both an overlay address (the hash of a secp256k1 public key) and an underlay address (enode:// URL). There are no changes to the BzzAddr format in this commit, but certain operations such as creating a BzzAddr from a node ID are now impossible because node IDs aren't public keys anymore. Most swarm-related changes in the series remove uses of NewAddrFromNodeID, replacing it with NewAddr which takes a complete node as argument. ToOverlayAddr is removed because we can just use the node ID directly.
| * all: fix various comment typos (#17591)HackyMiner2018-09-202-2/+2
| | | | | | | | | | | | * swarm: fixed comment typo * eth: fixed comment typo * cmd/puppeth: fixed comment typo
* | cmd/swarm, swarm: add stream peer servers limitJanos Guljas2018-09-246-19/+198
|/
* swarm/network: downgrade fetcher unable to request log message severity (#17692)Janoš Guljaš2018-09-181-1/+1
|
* swarm: Chunk refactor improvements (#17683)Balint Gabor2018-09-183-6/+6
| | | | | | | | * swarm/network: Protocol bump (for chunk refactor) * swarm/network: Increase discovery and stream protocol version too * swarm/network: Increase priority queue cap
* swarm: Chunk refactor (#17659)Balint Gabor2018-09-1317-466/+1293
| | | | | | Co-authored-by: Janos Guljas <janos@resenje.org> Co-authored-by: Balint Gabor <balint.g@gmail.com> Co-authored-by: Anton Evangelatov <anton.evangelatov@gmail.com> Co-authored-by: Viktor Trón <viktor.tron@gmail.com>
* Kademlia refactor (#17641)Viktor Trón2018-09-1212-361/+225
| | | | | | | | * swarm/network: simplify kademlia/hive; rid interfaces * swarm, swarm/network/stream, swarm/netork/simulations,, swarm/pss: adapt to new Kad API * swarm/network: minor changes re review; add missing lock to NeighbourhoodDepthC
* all: remove the duplicate 'the' in annotations (#17509)Wenbiao Zheng2018-08-273-3/+3
|
* swarm: fix typos (#17473)Geon Kim2018-08-221-3/+3
|
* swarm/network: bump bzz protocol version (#17449)Anton Evangelatov2018-08-212-2/+2
|
* swarm, swarm/network, swarm/pss: log error and fix logs (#17410)Anton Evangelatov2018-08-211-2/+2
| | | | | | * swarm, swarm/network, swarm/pss: log error and fix logs * swarm/pss: log compressed publickey
* swarm/network, swarm/storage: validate chunk size (#17397)Anton Evangelatov2018-08-141-0/+7
| | | | | | | | | | | | | | | | | | * swarm/network, swarm/storage: validate default chunk size * swarm/bmt, swarm/network, swarm/storage: update BMT hash initialisation * swarm/bmt: move segmentCount to tests * swarm/chunk: change chunk.DefaultSize to be untyped const * swarm/storage: add size validator * swarm/storage: add chunk size validation to localstore * swarm/storage: move validation from localstore to validator * swarm/storage: global chunk rules in MRU
* swarm: Added lightnode flag (#17291)Attila Gazso2018-08-072-17/+76
| | | | | | | | | | | | | | | | | | | | | | | | | * swarm: Added lightnode flag Added --lightnode command line parameter Added LightNode to Handshake message * swarm/config: Fixed variable naming * cmd/swarm: Changed BoolTFlag to BoolFlag for SwarmLightNodeEnabled * swarm/network: Changed logging * swarm/network: Changed protocol version testing * swarm/network: Renamed DefaultNetworkID variable to TestProtocolNetworkID * swarm/network: Bumped protocol version * swarm/network: Changed LightNode handhsake test to table driven * swarm/network: Changed back TestProtocolVersion to 5 for now * swarm/network: Moved the test configuration inside the test function scope
* cmd/swarm, swarm: various test fixes (#17299)Janoš Guljaš2018-08-064-10/+29
| | | | | | | | | | | | * swarm/network/simulation: increase the sleep duration for TestRun * cmd/swarm, swarm: fix failing tests on mac * cmd/swarm: update TestCLISwarmFs skip comment * swarm/network/simulation: adjust disconnections on simulation close * swarm/network/simulation: call cleanups after net shutdown
* Merge netsim mig to master (#17241)holisticode2018-07-3114-2433/+1365
| | | | | | | | | | | | | | | | | | | | | | | | * swarm: merged stream-tests migration to develop * swarm/network: expose simulation RandomUpNode to use in stream tests * swarm/network: wait for subs in PeerEvents and fix stream.runSyncTest * swarm: enforce waitkademlia for snapshot tests * swarm: fixed syncer tests and snapshot_sync_test * swarm: linting of simulation package * swarm: address review comments * swarm/network/stream: fix delivery_test bugs and refactor * swarm/network/stream: addressed PR comments @janos * swarm/network/stream: enforce waitKademlia, improve TestIntervals * swarm/network/stream: TestIntervals not waiting for chunk to be stored
* swarm: network simulation for swarm tests (#769)Janoš Guljaš2018-07-2317-0/+2770
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cmd/swarm: minor cli flag text adjustments * cmd/swarm, swarm/storage, swarm: fix mingw on windows test issues * cmd/swarm: support for smoke tests on the production swarm cluster * cmd/swarm/swarm-smoke: simplify cluster logic as per suggestion * changed colour of landing page * landing page reacts to enter keypress * swarm/api/http: sticky footer for swarm landing page using flex * swarm/api/http: sticky footer for error pages and fix for multiple choices * swarm: propagate ctx to internal apis (#754) * swarm/simnet: add basic node/service functions * swarm/netsim: add buckets for global state and kademlia health check * swarm/netsim: Use sync.Map as bucket and provide cleanup function for... * swarm, swarm/netsim: adjust SwarmNetworkTest * swarm/netsim: fix tests * swarm: added visualization option to sim net redesign * swarm/netsim: support multiple services per node * swarm/netsim: remove redundant return statement * swarm/netsim: add comments * swarm: shutdown HTTP in Simulation.Close * swarm: sim HTTP server timeout * swarm/netsim: add more simulation methods and peer events examples * swarm/netsim: add WaitKademlia example * swarm/netsim: fix comments * swarm/netsim: terminate peer events goroutines on simulation done * swarm, swarm/netsim: naming updates * swarm/netsim: return not healthy kademlias on WaitTillHealthy * swarm: fix WaitTillHealthy call in testSwarmNetwork * swarm/netsim: allow bucket to have any type for a key * swarm: Added snapshots to new netsim * swarm/netsim: add more tests for bucket * swarm/netsim: move http related things into separate files * swarm/netsim: add AddNodeWithService option * swarm/netsim: add more tests and Start* methods * swarm/netsim: add peer events and kademlia tests * swarm/netsim: fix some tests flakiness * swarm/netsim: improve random nodes selection, fix TestStartStop* tests * swarm/netsim: remove time measurement from TestClose to avoid flakiness * swarm/netsim: builder pattern for netsim HTTP server (#773) * swarm/netsim: add connect related tests * swarm/netsim: add comment for TestPeerEvents * swarm: rename netsim package to network/simulation
* swarm/network: bump up protocol versions due to wrapped message intro (#17170)Anton Evangelatov2018-07-133-7/+7
|
* swarm: integrate OpenTracing; propagate ctx to internal APIs (#17169)Anton Evangelatov2018-07-1313-85/+152
| | | | | | * swarm: propagate ctx, enable opentracing * swarm/tracing: log error when tracing is misconfigured
* swarm: ctx propagation; bmt fixes; pss generic notification framework (#17150)Anton Evangelatov2018-07-097-15/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cmd/swarm: minor cli flag text adjustments * swarm/api/http: sticky footer for swarm landing page using flex * swarm/api/http: sticky footer for error pages and fix for multiple choices * cmd/swarm, swarm/storage, swarm: fix mingw on windows test issues * cmd/swarm: update description of swarm cmd * swarm: added network ID test * cmd/swarm: support for smoke tests on the production swarm cluster * cmd/swarm/swarm-smoke: simplify cluster logic as per suggestion * swarm: propagate ctx to internal apis (#754) * swarm/metrics: collect disk measurements * swarm/bmt: fix io.Writer interface * Write now tolerates arbitrary variable buffers * added variable buffer tests * Write loop and finalise optimisation * refactor / rename * add tests for empty input * swarm/pss: (UPDATE) Generic notifications package (#744) swarm/pss: Generic package for creating pss notification svcs * swarm: Adding context to more functions * swarm/api: change colour of landing page in templates * swarm/api: change landing page to react to enter keypress
* swarm: network rewrite mergeethersphere2018-06-2252-4308/+10949
|
* all: fix various typos (#16533)Wuxiang2018-04-191-1/+1
| | | | | | | | * fix typo * fix typo * fix typo
* swarm: initial instrumentation (#15969)Anton Evangelatov2018-02-234-1/+76
| | | | | | | | | | | | | | | | | | * swarm: initial instrumentation with go-metrics * swarm: initialise metrics collection and add ResettingTimer to HTTP requests * swarm: update metrics flags names. remove redundant Timer. * swarm: rename method for periodically updating gauges * swarm: finalise metrics after feedback * swarm/network: always init kad metrics containers * swarm/network: off-by-one index in metrics containers * swarm, metrics: resolved conflicts
* cmd/swarm: add config file (#15548)holisticode2017-12-124-11/+22
| | | | | | | | | | | | | | | | | This commit adds a TOML configuration option to swarm. It reuses the TOML configuration structure used in geth with swarm customized items. The commit: * Adds a "dumpconfig" command to the swarm executable which allows printing the (default) configuration to stdout, which then can be redirected to a file in order to customize it. * Adds a "--config <file>" option to the swarm executable which will allow to load a configuration file in TOML format from the specified location in order to initialize the Swarm node The override priorities are like follows: environment variables override command line arguments override config file override default config.
* p2p, swarm/network/kademlia: use IsZero to check for zero time (#15603)ferhat elmas2017-12-041-1/+1
|
* build: enable unconvert linter (#15456)ferhat elmas2017-11-115-7/+7
| | | | | | | | | * build: enable unconvert linter - fixes #15453 - update code base for failing cases * cmd/puppeth: replace syscall.Stdin with os.Stdin.Fd() for unconvert linter
* swarm/storage: pyramid chunker re-write (#14382)Zahoor Mohamed2017-09-221-2/+2
|
* swarm: fix megacheck warningsEgon Elbre2017-08-144-22/+9
|
* swarm/network/kademlia: set kademlia log output to debug instead of warn (#3787)holisticode2017-03-181-1/+1
|
* errs: kill it with firePéter Szilágyi2017-03-011-70/+33
|
* all: disable log message colors outside of gethFelix Lange2017-02-271-1/+1
| | | | Also tweak behaviour so colors are only enabled when stderr is a terminal.
* eth, les, swarm: fix go vet issues sufraced by log15Péter Szilágyi2017-02-234-6/+6
|
* all: blidly swap out glog to our log15, logs need reworkPéter Szilágyi2017-02-239-158/+151
|
* swarm: remove superfluous line break in log statementsPéter Szilágyi2017-02-231-1/+1
|
* swarm/network: fix chunk integrity checks (#3665)Viktor Trón2017-02-132-12/+18
| | | | | | | | | | * swarm/network: integrity on incoming known chunks * swarm/network: fix integrity check for incoming chunks * swarm/storage: imrpoved integrity checking on chunks * dbstore panics on corrupt chunk entry an prompts user to run cleandb * memstore adds logging for garbage collection * dbstore refactor item delete. correct partial deletes in Get * cmd/swarm: added cleandb subcommand
* all: fix ineffectual assignments and remove uses of crypto.Sha3Felix Lange2017-01-092-8/+8
| | | | | go get github.com/gordonklaus/ineffassign ineffassign .
* logger, pow/dagger, pow/ezp: delete dead codeFelix Lange2017-01-071-7/+0
|
* swarm/network, cmd/swarm: swarm default network id is 3 (to match Ropsten)zelig2016-12-131-1/+1
|
* cmd/bzzd: swarm daemon fixes (#3359)Viktor Trón2016-11-281-7/+11
| | | | | | | | | | | | * cmd/bzzd: add missing p2p/discovery flags * cmd/bzzd: fix two bugs crashing bzzd if bootnodes flag given * cmd/bzzd: make no swap default, renamed flag bzznoswap->bzzswap * internal/web3ext: correct methods for bzz IPC module * cmd/bzzd: ethapi param not mandatory. Warning if no blockchain * cmd/bzzd: correct default IPC modules in help string * cmd/utils: fix help description for networkId - add Ropsten * cmd/bzz, swarm/api, swarm/network: add swarm networkId flag * cmd/bzzd: change nosync flag to sync and BootTFlag
* swarm/network: prevent relay of invalid IPsFelix Lange2016-11-231-0/+5
|
* swarm/network: skip TestSyncDbFelix Lange2016-11-111-0/+2
|
* all: update license informationFelix Lange2016-11-091-1/+1
|
* swarm: plan bee for content storage and distribution on web3ΞTHΞЯSPHΞЯΞ2016-08-3114-0/+4462
This change imports the Swarm protocol codebase. Compared to the 'swarm' branch, a few mostly cosmetic changes had to be made: * The various redundant log message prefixes are gone. * All files now have LGPLv3 license headers. * Minor code changes were needed to please go vet and make the tests pass on Windows. * Further changes were required to adapt to the go-ethereum develop branch and its new Go APIs. Some code has not (yet) been brought over: * swarm/cmd/bzzhash: will reappear as cmd/bzzhash later * swarm/cmd/bzzup.sh: will be reimplemented in cmd/bzzup * swarm/cmd/makegenesis: will reappear somehow * swarm/examples/album: will move to a separate repository * swarm/examples/filemanager: ditto * swarm/examples/files: will not be merged * swarm/test/*: will not be merged * swarm/services/swear: will reappear as contracts/swear when needed
generated by cgit (git 2.34.1) at 2024-12-26 17:07:44 +0800