diff --git a/eth/protocols/snap/handler.go b/eth/protocols/snap/handler.go index 604604a099..b5de0a652c 100644 --- a/eth/protocols/snap/handler.go +++ b/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 } } diff --git a/eth/protocols/snap/handler_test.go b/eth/protocols/snap/handler_test.go index 53b22ca7f7..cb4b378a8d 100644 --- a/eth/protocols/snap/handler_test.go +++ b/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) diff --git a/eth/protocols/snap/protocol.go b/eth/protocols/snap/protocol.go index 9c51f9ddfb..2af3f8eda8 100644 --- a/eth/protocols/snap/protocol.go +++ b/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.