From bd58098f2d88aabe5c555f5aa3d54d4786b7895b Mon Sep 17 00:00:00 2001 From: Balint Gabor Date: Tue, 18 Sep 2018 10:17:13 +0200 Subject: [PATCH] swarm: Chunk refactor improvements (#17683) * swarm/network: Protocol bump (for chunk refactor) * swarm/network: Increase discovery and stream protocol version too * swarm/network: Increase priority queue cap --- swarm/network/protocol.go | 4 ++-- swarm/network/protocol_test.go | 2 +- swarm/network/stream/stream.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index ef0956d5f..d509d157b 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -44,7 +44,7 @@ const ( // BzzSpec is the spec of the generic swarm handshake var BzzSpec = &protocols.Spec{ Name: "bzz", - Version: 6, + Version: 7, MaxMsgSize: 10 * 1024 * 1024, Messages: []interface{}{ HandshakeMsg{}, @@ -54,7 +54,7 @@ var BzzSpec = &protocols.Spec{ // DiscoverySpec is the spec for the bzz discovery subprotocols var DiscoverySpec = &protocols.Spec{ Name: "hive", - Version: 5, + Version: 6, MaxMsgSize: 10 * 1024 * 1024, Messages: []interface{}{ peersMsg{}, diff --git a/swarm/network/protocol_test.go b/swarm/network/protocol_test.go index c052c536a..0fc858371 100644 --- a/swarm/network/protocol_test.go +++ b/swarm/network/protocol_test.go @@ -31,7 +31,7 @@ import ( ) const ( - TestProtocolVersion = 6 + TestProtocolVersion = 7 TestProtocolNetworkID = 3 ) diff --git a/swarm/network/stream/stream.go b/swarm/network/stream/stream.go index 1f1f34b7b..319fc62c9 100644 --- a/swarm/network/stream/stream.go +++ b/swarm/network/stream/stream.go @@ -41,8 +41,8 @@ const ( Mid High Top - PriorityQueue = 4 // number of priority queues - Low, Mid, High, Top - PriorityQueueCap = 128 // queue capacity + PriorityQueue = 4 // number of priority queues - Low, Mid, High, Top + PriorityQueueCap = 4096 // queue capacity HashSize = 32 ) @@ -639,7 +639,7 @@ func (c *clientParams) clientCreated() { // Spec is the spec of the streamer protocol var Spec = &protocols.Spec{ Name: "stream", - Version: 5, + Version: 6, MaxMsgSize: 10 * 1024 * 1024, Messages: []interface{}{ UnsubscribeMsg{},