From c77940f6e6a9b3e5e09a9643a2c20f72e0829ee9 Mon Sep 17 00:00:00 2001 From: Sanaz Taheri Boshrooyeh <35961250+staheri14@users.noreply.github.com> Date: Fri, 9 Apr 2021 09:50:51 -0700 Subject: [PATCH] Fix the issue in the order of fields of HistoryQuery (#470) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Oskar Thorén --- waku/v2/protocol/waku_store/waku_store.nim | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/waku/v2/protocol/waku_store/waku_store.nim b/waku/v2/protocol/waku_store/waku_store.nim index 3e2c60713..ad0bead4f 100644 --- a/waku/v2/protocol/waku_store/waku_store.nim +++ b/waku/v2/protocol/waku_store/waku_store.nim @@ -117,17 +117,17 @@ proc init*(T: type HistoryQuery, buffer: seq[byte]): ProtoResult[T] = var topics: seq[ContentTopic] - discard ? pb.getRepeatedField(1, topics) + discard ? pb.getRepeatedField(2, topics) msg.topics = topics var pagingInfoBuffer: seq[byte] - discard ? pb.getField(2, pagingInfoBuffer) + discard ? pb.getField(3, pagingInfoBuffer) msg.pagingInfo = ? PagingInfo.init(pagingInfoBuffer) - discard ? pb.getField(3, msg.startTime) - discard ? pb.getField(4, msg.endTime) + discard ? pb.getField(4, msg.startTime) + discard ? pb.getField(5, msg.endTime) ok(msg) @@ -170,12 +170,12 @@ proc encode*(query: HistoryQuery): ProtoBuffer = result = initProtoBuffer() for topic in query.topics: - result.write(1, topic) + result.write(2, topic) - result.write(2, query.pagingInfo.encode()) + result.write(3, query.pagingInfo.encode()) - result.write(3, query.startTime) - result.write(4, query.endTime) + result.write(4, query.startTime) + result.write(5, query.endTime) proc encode*(response: HistoryResponse): ProtoBuffer = result = initProtoBuffer()