From 5ccc71c261d29a6e9d274669d1e7db30f7d8c39d Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Thu, 13 Aug 2020 11:59:08 +0200
Subject: [PATCH] Move QueryClient into subfolder

---
 packages/stargate/src/queries/bank.spec.ts             | 2 +-
 packages/stargate/src/queries/bank.ts                  | 2 +-
 packages/stargate/src/queries/index.ts                 | 6 ++++++
 packages/stargate/src/{ => queries}/queryclient.ts     | 0
 packages/stargate/src/stargateclient.ts                | 3 +--
 packages/stargate/types/queries/bank.d.ts              | 2 +-
 packages/stargate/types/queries/index.d.ts             | 1 +
 packages/stargate/types/{ => queries}/queryclient.d.ts | 0
 8 files changed, 11 insertions(+), 5 deletions(-)
 rename packages/stargate/src/{ => queries}/queryclient.ts (100%)
 rename packages/stargate/types/{ => queries}/queryclient.d.ts (100%)

diff --git a/packages/stargate/src/queries/bank.spec.ts b/packages/stargate/src/queries/bank.spec.ts
index 89831469..7f7d7a11 100644
--- a/packages/stargate/src/queries/bank.spec.ts
+++ b/packages/stargate/src/queries/bank.spec.ts
@@ -1,6 +1,5 @@
 import { Client as TendermintClient } from "@cosmjs/tendermint-rpc";
 
-import { QueryClient } from "../queryclient";
 import {
   nonExistentAddress,
   nonNegativeIntegerMatcher,
@@ -9,6 +8,7 @@ import {
   unused,
 } from "../testutils.spec";
 import { BankExtension, setupBankExtension } from "./bank";
+import { QueryClient } from "./queryclient";
 
 async function makeBankClient(rpcUrl: string): Promise<QueryClient & BankExtension> {
   // TODO: tmClient is not owned by QueryClient but should be disconnected somehow (once we use WebSockets)
diff --git a/packages/stargate/src/queries/bank.ts b/packages/stargate/src/queries/bank.ts
index a4b66ba6..6f6c3a93 100644
--- a/packages/stargate/src/queries/bank.ts
+++ b/packages/stargate/src/queries/bank.ts
@@ -2,7 +2,7 @@ import { toAscii } from "@cosmjs/encoding";
 import { assert } from "@cosmjs/utils";
 
 import { cosmos } from "../generated/codecimpl";
-import { QueryClient } from "../queryclient";
+import { QueryClient } from "./queryclient";
 import { toAccAddress, toObject } from "./utils";
 
 export interface BankExtension {
diff --git a/packages/stargate/src/queries/index.ts b/packages/stargate/src/queries/index.ts
index 07dc15ed..854d741c 100644
--- a/packages/stargate/src/queries/index.ts
+++ b/packages/stargate/src/queries/index.ts
@@ -1 +1,7 @@
+// Base symbols
+
+export { QueryClient } from "./queryclient";
+
+// Extensions
+
 export { BankExtension, setupBankExtension } from "./bank";
diff --git a/packages/stargate/src/queryclient.ts b/packages/stargate/src/queries/queryclient.ts
similarity index 100%
rename from packages/stargate/src/queryclient.ts
rename to packages/stargate/src/queries/queryclient.ts
diff --git a/packages/stargate/src/stargateclient.ts b/packages/stargate/src/stargateclient.ts
index 8d8d147b..93970323 100644
--- a/packages/stargate/src/stargateclient.ts
+++ b/packages/stargate/src/stargateclient.ts
@@ -17,8 +17,7 @@ import { assert, assertDefined } from "@cosmjs/utils";
 import Long from "long";
 
 import { cosmos } from "./generated/codecimpl";
-import { BankExtension, setupBankExtension } from "./queries";
-import { QueryClient } from "./queryclient";
+import { BankExtension, QueryClient, setupBankExtension } from "./queries";
 
 /** A transaction that is indexed as part of the transaction history */
 export interface IndexedTx {
diff --git a/packages/stargate/types/queries/bank.d.ts b/packages/stargate/types/queries/bank.d.ts
index 4cb53485..5e02551c 100644
--- a/packages/stargate/types/queries/bank.d.ts
+++ b/packages/stargate/types/queries/bank.d.ts
@@ -1,5 +1,5 @@
 import { cosmos } from "../generated/codecimpl";
-import { QueryClient } from "../queryclient";
+import { QueryClient } from "./queryclient";
 export interface BankExtension {
   readonly bank: {
     readonly balance: (address: string, denom: string) => Promise<cosmos.ICoin | null>;
diff --git a/packages/stargate/types/queries/index.d.ts b/packages/stargate/types/queries/index.d.ts
index 07dc15ed..1e80a28e 100644
--- a/packages/stargate/types/queries/index.d.ts
+++ b/packages/stargate/types/queries/index.d.ts
@@ -1 +1,2 @@
+export { QueryClient } from "./queryclient";
 export { BankExtension, setupBankExtension } from "./bank";
diff --git a/packages/stargate/types/queryclient.d.ts b/packages/stargate/types/queries/queryclient.d.ts
similarity index 100%
rename from packages/stargate/types/queryclient.d.ts
rename to packages/stargate/types/queries/queryclient.d.ts