From 60094dc1f05dcb748a2c055741bbed2f79dda4b4 Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Thu, 4 Feb 2021 12:49:20 +0000
Subject: [PATCH] cosmwasm-stargate: Use createPagination util in wasm queries

---
 .../cosmwasm-stargate/src/queries/wasm.ts     | 30 ++++---------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/packages/cosmwasm-stargate/src/queries/wasm.ts b/packages/cosmwasm-stargate/src/queries/wasm.ts
index b59b0762..59da054c 100644
--- a/packages/cosmwasm-stargate/src/queries/wasm.ts
+++ b/packages/cosmwasm-stargate/src/queries/wasm.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { JsonObject } from "@cosmjs/cosmwasm-launchpad";
 import { fromUtf8, toAscii } from "@cosmjs/encoding";
-import { createRpc, QueryClient } from "@cosmjs/stargate";
+import { createPagination, createRpc, QueryClient } from "@cosmjs/stargate";
 import Long from "long";
 
 import {
@@ -73,12 +73,7 @@ export function setupWasmExtension(base: QueryClient): WasmExtension {
       wasm: {
         listCodeInfo: async (paginationKey?: Uint8Array) => {
           const request = {
-            pagination: {
-              key: paginationKey ?? new Uint8Array(),
-              offset: Long.fromNumber(0),
-              limit: Long.fromNumber(0),
-              countTotal: false,
-            },
+            pagination: createPagination(paginationKey),
           };
           return queryService.Codes(request);
         },
@@ -88,12 +83,7 @@ export function setupWasmExtension(base: QueryClient): WasmExtension {
         },
         listContractsByCodeId: async (id: number, paginationKey?: Uint8Array) => {
           const pagination = {
-            pagination: {
-              key: paginationKey ?? new Uint8Array(),
-              offset: Long.fromNumber(0),
-              limit: Long.fromNumber(0),
-              countTotal: false,
-            },
+            pagination: createPagination(paginationKey),
           };
           const request = { ...pagination, codeId: Long.fromNumber(id) };
           return queryService.ContractsByCode(request);
@@ -105,12 +95,7 @@ export function setupWasmExtension(base: QueryClient): WasmExtension {
 
         getContractCodeHistory: async (address: string, paginationKey?: Uint8Array) => {
           const pagination = {
-            pagination: {
-              key: paginationKey ?? new Uint8Array(),
-              offset: Long.fromNumber(0),
-              limit: Long.fromNumber(0),
-              countTotal: false,
-            },
+            pagination: createPagination(paginationKey),
           };
           const request = { ...pagination, address: address };
           return queryService.ContractHistory(request);
@@ -118,12 +103,7 @@ export function setupWasmExtension(base: QueryClient): WasmExtension {
 
         getAllContractState: async (address: string, paginationKey?: Uint8Array) => {
           const pagination = {
-            pagination: {
-              key: paginationKey ?? new Uint8Array(),
-              offset: Long.fromNumber(0),
-              limit: Long.fromNumber(0),
-              countTotal: false,
-            },
+            pagination: createPagination(paginationKey),
           };
           const request = { ...pagination, address: address };
           return queryService.AllContractState(request);