From 36e86543cbf244f613914a7751e9c2cffe643843 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Thu, 30 Jan 2020 10:48:26 +0100
Subject: [PATCH] Let tokenTickersOfFirstChain not depend on MultiChainSigner

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

diff --git a/packages/faucet/src/actions/start/start.ts b/packages/faucet/src/actions/start/start.ts
index 4b5303ab..64da6e5a 100644
--- a/packages/faucet/src/actions/start/start.ts
+++ b/packages/faucet/src/actions/start/start.ts
@@ -54,7 +54,7 @@ export async function start(args: ReadonlyArray<string>): Promise<void> {
   setFractionalDigits(codecDefaultFractionalDigits());
   await setSecretAndCreateIdentities(profile, constants.mnemonic, connectedChainId);
 
-  const chainTokens = await tokenTickersOfFirstChain(signer);
+  const chainTokens = await tokenTickersOfFirstChain(connection);
   console.info("Chain tokens:", chainTokens);
 
   const accounts = await accountsOfFirstChain(profile, connection);
diff --git a/packages/faucet/src/multichainhelpers.ts b/packages/faucet/src/multichainhelpers.ts
index 42b7898c..5040cafc 100644
--- a/packages/faucet/src/multichainhelpers.ts
+++ b/packages/faucet/src/multichainhelpers.ts
@@ -52,10 +52,9 @@ export async function accountsOfFirstChain(
 }
 
 export async function tokenTickersOfFirstChain(
-  signer: MultiChainSigner,
+  connection: BlockchainConnection,
 ): Promise<ReadonlyArray<TokenTicker>> {
-  const chainId = signer.chainIds()[0];
-  return (await signer.connection(chainId).getAllTokens()).map(token => token.tokenTicker);
+  return (await connection.getAllTokens()).map(token => token.tokenTicker);
 }
 
 /**
@@ -97,7 +96,7 @@ export async function refillFirstChain(profile: UserProfile, signer: MultiChainS
   const connection = signer.connection(chainId);
 
   console.info(`Connected to network: ${chainId}`);
-  console.info(`Tokens on network: ${(await tokenTickersOfFirstChain(signer)).join(", ")}`);
+  console.info(`Tokens on network: ${(await tokenTickersOfFirstChain(connection)).join(", ")}`);
 
   const holderIdentity = identitiesOfFirstWallet(profile)[0];