eth/protocols/snap: address review feedback on softlimit and not advertising snap2 yet

eth/protocols/snap/handler.go

@@ -672,9 +672,6 @@ func ServiceGetTrieNodesQuery(chain *core.BlockChain, req *GetTrieNodesPacket, s
 // ServiceGetAccessListsQuery assembles the response to an access list query.
 // It is exposed to allow external packages to test protocol behavior.
 func ServiceGetAccessListsQuery(chain *core.BlockChain, req *GetAccessListsPacket) []rlp.RawValue {
-	if req.Bytes > softResponseLimit {
-		req.Bytes = softResponseLimit
-	}
 	// Cap the number of lookups
 	if len(req.Hashes) > maxAccessListLookups {
 		req.Hashes = req.Hashes[:maxAccessListLookups]
@@ -691,7 +688,7 @@ func ServiceGetAccessListsQuery(chain *core.BlockChain, req *GetAccessListsPacke
 			// Either the block is unknown or the BAL doesn't exist
 			bals = append(bals, nil)
 		}
-		if bytes > req.Bytes {
+		if bytes > softResponseLimit {
 			break
 		}
 	}

eth/protocols/snap/handler_test.go

@@ -80,7 +80,6 @@ func TestServiceGetAccessListsQuery(t *testing.T) {
 	req := &GetAccessListsPacket{
 		ID:     1,
 		Hashes: hashes,
-		Bytes:  softResponseLimit,
 	}
 	result := ServiceGetAccessListsQuery(bc, req)
 
@@ -106,7 +105,6 @@ func TestServiceGetAccessListsQueryEmpty(t *testing.T) {
 	req := &GetAccessListsPacket{
 		ID:     2,
 		Hashes: mixed,
-		Bytes:  softResponseLimit,
 	}
 	result := ServiceGetAccessListsQuery(bc, req)
 
@@ -149,7 +147,6 @@ func TestServiceGetAccessListsQueryCap(t *testing.T) {
 	req := &GetAccessListsPacket{
 		ID:     3,
 		Hashes: hashes,
-		Bytes:  softResponseLimit,
 	}
 	result := ServiceGetAccessListsQuery(bc, req)
 
@@ -174,7 +171,6 @@ func TestServiceGetAccessListsQueryByteLimit(t *testing.T) {
 	req := &GetAccessListsPacket{
 		ID:     0,
 		Hashes: hashes,
-		Bytes:  softResponseLimit,
 	}
 	result := ServiceGetAccessListsQuery(bc, req)
 

eth/protocols/snap/protocol.go

@@ -37,7 +37,7 @@ const ProtocolName = "snap"
 
 // ProtocolVersions are the supported versions of the `snap` protocol (first
 // is primary).
-var ProtocolVersions = []uint{SNAP2, SNAP1}
+var ProtocolVersions = []uint{SNAP1}
 
 // protocolLengths are the number of implemented message corresponding to
 // different protocol versions.
@@ -222,7 +222,6 @@ type TrieNodesPacket struct {
 type GetAccessListsPacket struct {
 	ID     uint64        // Request ID to match up responses with
 	Hashes []common.Hash // Block hashes to retrieve BALs for
-	Bytes  uint64        // Soft limit at which to stop returning data
 }
 
 // AccessListsPacket is the response to GetAccessListsPacket.