From b7d8e940f054b11eb75771e6c91ec965069396cc Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Mon, 15 Jun 2020 16:29:44 +0100
Subject: [PATCH] tendermint-rpc: Replace @iov/encoding dependency

---
 packages/tendermint-rpc/package.json             | 3 ++-
 packages/tendermint-rpc/src/client.spec.ts       | 2 +-
 packages/tendermint-rpc/src/encodings.ts         | 3 ++-
 packages/tendermint-rpc/src/v0-31/hasher.spec.ts | 2 +-
 packages/tendermint-rpc/src/v0-31/requests.ts    | 2 +-
 packages/tendermint-rpc/src/v0-31/responses.ts   | 2 +-
 packages/tendermint-rpc/src/v0-32/hasher.spec.ts | 2 +-
 packages/tendermint-rpc/src/v0-32/requests.ts    | 2 +-
 packages/tendermint-rpc/src/v0-32/responses.ts   | 2 +-
 9 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/tendermint-rpc/package.json b/packages/tendermint-rpc/package.json
index d44dd59d..9d215aba 100644
--- a/packages/tendermint-rpc/package.json
+++ b/packages/tendermint-rpc/package.json
@@ -38,8 +38,9 @@
     "pack-web": "yarn build-or-skip && webpack --mode development --config webpack.web.config.js"
   },
   "dependencies": {
+    "@cosmjs/encoding": "^0.20.0",
+    "@cosmjs/math": "^0.20.0",
     "@iov/crypto": "^2.3.2",
-    "@iov/encoding": "^2.3.2",
     "@iov/jsonrpc": "^2.3.2",
     "@iov/socket": "^2.3.2",
     "axios": "^0.19.0",
diff --git a/packages/tendermint-rpc/src/client.spec.ts b/packages/tendermint-rpc/src/client.spec.ts
index 0a5bd6e5..a900a81e 100644
--- a/packages/tendermint-rpc/src/client.spec.ts
+++ b/packages/tendermint-rpc/src/client.spec.ts
@@ -1,5 +1,5 @@
 // tslint:disable:readonly-array
-import { toAscii } from "@iov/encoding";
+import { toAscii } from "@cosmjs/encoding";
 import { firstEvent, toListPromise } from "@iov/stream";
 import { sleep } from "@iov/utils";
 import { ReadonlyDate } from "readonly-date";
diff --git a/packages/tendermint-rpc/src/encodings.ts b/packages/tendermint-rpc/src/encodings.ts
index 60b49da1..ac8bc925 100644
--- a/packages/tendermint-rpc/src/encodings.ts
+++ b/packages/tendermint-rpc/src/encodings.ts
@@ -1,4 +1,5 @@
-import { fromBase64, fromHex, fromRfc3339, Int53, toBase64, toHex, toUtf8 } from "@iov/encoding";
+import { fromBase64, fromHex, fromRfc3339, toBase64, toHex, toUtf8 } from "@cosmjs/encoding";
+import { Int53 } from "@cosmjs/math";
 import { As } from "type-tagger";
 
 import { BlockId, ReadonlyDateWithNanoseconds, Version } from "./responses";
diff --git a/packages/tendermint-rpc/src/v0-31/hasher.spec.ts b/packages/tendermint-rpc/src/v0-31/hasher.spec.ts
index e9b024b0..95b8aea4 100644
--- a/packages/tendermint-rpc/src/v0-31/hasher.spec.ts
+++ b/packages/tendermint-rpc/src/v0-31/hasher.spec.ts
@@ -1,4 +1,4 @@
-import { fromBase64, fromHex } from "@iov/encoding";
+import { fromBase64, fromHex } from "@cosmjs/encoding";
 import { ReadonlyDate } from "readonly-date";
 
 import { ReadonlyDateWithNanoseconds } from "../responses";
diff --git a/packages/tendermint-rpc/src/v0-31/requests.ts b/packages/tendermint-rpc/src/v0-31/requests.ts
index f91d4423..7526fe0a 100644
--- a/packages/tendermint-rpc/src/v0-31/requests.ts
+++ b/packages/tendermint-rpc/src/v0-31/requests.ts
@@ -1,4 +1,4 @@
-import { toHex } from "@iov/encoding";
+import { toHex } from "@cosmjs/encoding";
 import { JsonRpcRequest } from "@iov/jsonrpc";
 
 import { assertNotEmpty, Base64, Base64String, HexString, Integer, IntegerString, may } from "../encodings";
diff --git a/packages/tendermint-rpc/src/v0-31/responses.ts b/packages/tendermint-rpc/src/v0-31/responses.ts
index f136e39c..86ea149a 100644
--- a/packages/tendermint-rpc/src/v0-31/responses.ts
+++ b/packages/tendermint-rpc/src/v0-31/responses.ts
@@ -1,4 +1,4 @@
-import { fromHex } from "@iov/encoding";
+import { fromHex } from "@cosmjs/encoding";
 import { JsonRpcSuccessResponse } from "@iov/jsonrpc";
 
 import {
diff --git a/packages/tendermint-rpc/src/v0-32/hasher.spec.ts b/packages/tendermint-rpc/src/v0-32/hasher.spec.ts
index e9b024b0..95b8aea4 100644
--- a/packages/tendermint-rpc/src/v0-32/hasher.spec.ts
+++ b/packages/tendermint-rpc/src/v0-32/hasher.spec.ts
@@ -1,4 +1,4 @@
-import { fromBase64, fromHex } from "@iov/encoding";
+import { fromBase64, fromHex } from "@cosmjs/encoding";
 import { ReadonlyDate } from "readonly-date";
 
 import { ReadonlyDateWithNanoseconds } from "../responses";
diff --git a/packages/tendermint-rpc/src/v0-32/requests.ts b/packages/tendermint-rpc/src/v0-32/requests.ts
index f91d4423..7526fe0a 100644
--- a/packages/tendermint-rpc/src/v0-32/requests.ts
+++ b/packages/tendermint-rpc/src/v0-32/requests.ts
@@ -1,4 +1,4 @@
-import { toHex } from "@iov/encoding";
+import { toHex } from "@cosmjs/encoding";
 import { JsonRpcRequest } from "@iov/jsonrpc";
 
 import { assertNotEmpty, Base64, Base64String, HexString, Integer, IntegerString, may } from "../encodings";
diff --git a/packages/tendermint-rpc/src/v0-32/responses.ts b/packages/tendermint-rpc/src/v0-32/responses.ts
index 6f6cc239..2426b98a 100644
--- a/packages/tendermint-rpc/src/v0-32/responses.ts
+++ b/packages/tendermint-rpc/src/v0-32/responses.ts
@@ -1,4 +1,4 @@
-import { fromHex } from "@iov/encoding";
+import { fromHex } from "@cosmjs/encoding";
 import { JsonRpcSuccessResponse } from "@iov/jsonrpc";
 
 import {