From 6ea963c87db132e98e1002bd18666882897604ab Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Thu, 30 Jan 2020 10:51:16 +0100
Subject: [PATCH] Remove remaining uses of MultiChainSigner

---
 packages/faucet/src/actions/start/start.ts |  8 +++-----
 packages/faucet/src/multichainhelpers.ts   | 11 +++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/faucet/src/actions/start/start.ts b/packages/faucet/src/actions/start/start.ts
index 64da6e5a..fcf90141 100644
--- a/packages/faucet/src/actions/start/start.ts
+++ b/packages/faucet/src/actions/start/start.ts
@@ -1,6 +1,5 @@
 // tslint:disable: no-object-mutation
 import { UserProfile } from "@iov/keycontrol";
-import { MultiChainSigner } from "@iov/multichain";
 import cors = require("@koa/cors");
 import Koa from "koa";
 import bodyParser from "koa-bodyparser";
@@ -44,9 +43,8 @@ export async function start(args: ReadonlyArray<string>): Promise<void> {
   if (!constants.mnemonic) {
     throw new Error("The FAUCET_MNEMONIC environment variable is not set");
   }
-  const signer = new MultiChainSigner(profile);
   console.info(`Connecting to blockchain ${blockchainBaseUrl} ...`);
-  const connection = (await signer.addChain(createChainConnector(blockchainBaseUrl))).connection;
+  const connection = await createChainConnector(blockchainBaseUrl).establishConnection();
 
   const connectedChainId = connection.chainId();
   console.info(`Connected to network: ${connectedChainId}`);
@@ -70,8 +68,8 @@ export async function start(args: ReadonlyArray<string>): Promise<void> {
 
   const distibutorIdentities = identitiesOfFirstWallet(profile).slice(1);
 
-  await refillFirstChain(profile, signer);
-  setInterval(async () => refillFirstChain(profile, signer), 60_000); // ever 60 seconds
+  await refillFirstChain(profile, connection);
+  setInterval(async () => refillFirstChain(profile, connection), 60_000); // ever 60 seconds
 
   console.info("Creating webserver ...");
   const api = new Koa();
diff --git a/packages/faucet/src/multichainhelpers.ts b/packages/faucet/src/multichainhelpers.ts
index 5040cafc..f292d228 100644
--- a/packages/faucet/src/multichainhelpers.ts
+++ b/packages/faucet/src/multichainhelpers.ts
@@ -8,7 +8,6 @@ import {
   TokenTicker,
 } from "@iov/bcp";
 import { UserProfile } from "@iov/keycontrol";
-import { MultiChainSigner } from "@iov/multichain";
 
 import { needsRefill, refillAmount } from "./cashflow";
 import { codecImplementation } from "./codec";
@@ -91,11 +90,11 @@ export function availableTokensFromHolder(holderAccount: Account): ReadonlyArray
   return holderAccount.balance.map(coin => coin.tokenTicker);
 }
 
-export async function refillFirstChain(profile: UserProfile, signer: MultiChainSigner): Promise<void> {
-  const chainId = signer.chainIds()[0];
-  const connection = signer.connection(chainId);
-
-  console.info(`Connected to network: ${chainId}`);
+export async function refillFirstChain(
+  profile: UserProfile,
+  connection: BlockchainConnection,
+): Promise<void> {
+  console.info(`Connected to network: ${connection.chainId()}`);
   console.info(`Tokens on network: ${(await tokenTickersOfFirstChain(connection)).join(", ")}`);
 
   const holderIdentity = identitiesOfFirstWallet(profile)[0];