From c41f42193e9b8f1387039ae9e67145956ae52d93 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Thu, 30 Jan 2020 12:35:30 +0100
Subject: [PATCH] Simplify codecImplementation() and establishConnection()

---
 packages/faucet/src/actions/start/start.ts |  4 +--
 packages/faucet/src/codec.ts               | 40 ++++++++++++----------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/packages/faucet/src/actions/start/start.ts b/packages/faucet/src/actions/start/start.ts
index c86b2637..3d2ff2f3 100644
--- a/packages/faucet/src/actions/start/start.ts
+++ b/packages/faucet/src/actions/start/start.ts
@@ -5,7 +5,7 @@ import Koa from "koa";
 import bodyParser from "koa-bodyparser";
 
 import { creditAmount, setFractionalDigits } from "../../cashflow";
-import { codecDefaultFractionalDigits, codecImplementation, createChainConnector } from "../../codec";
+import { codecDefaultFractionalDigits, codecImplementation, establishConnection } from "../../codec";
 import * as constants from "../../constants";
 import { logAccountsState, logSendJob } from "../../debugging";
 import {
@@ -44,7 +44,7 @@ export async function start(args: ReadonlyArray<string>): Promise<void> {
     throw new Error("The FAUCET_MNEMONIC environment variable is not set");
   }
   console.info(`Connecting to blockchain ${blockchainBaseUrl} ...`);
-  const connection = await createChainConnector(blockchainBaseUrl).establishConnection();
+  const connection = await establishConnection(blockchainBaseUrl);
 
   const connectedChainId = connection.chainId();
   console.info(`Connected to network: ${connectedChainId}`);
diff --git a/packages/faucet/src/codec.ts b/packages/faucet/src/codec.ts
index 624a92b1..91b76481 100644
--- a/packages/faucet/src/codec.ts
+++ b/packages/faucet/src/codec.ts
@@ -1,26 +1,28 @@
-import { createCosmWasmConnector, TokenInfo } from "@cosmwasm/bcp";
-import { ChainConnector, TokenTicker, TxCodec } from "@iov/bcp";
+import { CosmWasmCodec, CosmWasmConnection, TokenInfo } from "@cosmwasm/bcp";
+import { TokenTicker, TxCodec } from "@iov/bcp";
 
-export function createChainConnector(url: string): ChainConnector {
-  const tokens: readonly TokenInfo[] = [
-    {
-      fractionalDigits: 6,
-      tokenName: "Fee Token",
-      tokenTicker: "COSM" as TokenTicker,
-      denom: "cosm",
-    },
-    {
-      fractionalDigits: 6,
-      tokenName: "Staking Token",
-      tokenTicker: "STAKE" as TokenTicker,
-      denom: "stake",
-    },
-  ];
-  return createCosmWasmConnector(url, "cosmos", tokens);
+const prefix = "cosmos";
+const tokens: readonly TokenInfo[] = [
+  {
+    fractionalDigits: 6,
+    tokenName: "Fee Token",
+    tokenTicker: "COSM" as TokenTicker,
+    denom: "cosm",
+  },
+  {
+    fractionalDigits: 6,
+    tokenName: "Staking Token",
+    tokenTicker: "STAKE" as TokenTicker,
+    denom: "stake",
+  },
+];
+
+export async function establishConnection(url: string): Promise<CosmWasmConnection> {
+  return CosmWasmConnection.establish(url, prefix, tokens);
 }
 
 export function codecImplementation(): TxCodec {
-  return createChainConnector("unused dummy url").codec;
+  return new CosmWasmCodec(prefix, tokens);
 }
 
 export function codecDefaultFractionalDigits(): number {