From d4446f12e8aae673f0999fba2665638e5a163741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Espen=20H=C3=B8jsgaard?= <espen@espen.dk>
Date: Fri, 24 Nov 2023 10:31:04 +0100
Subject: [PATCH] feat!: Remove Mangrove.getTokenAndAddress

---
 CHANGELOG.md             |  1 +
 src/kandel/kandelFarm.ts | 16 ++++++++--------
 src/mangrove.ts          | 12 ------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1802b6f53..09a237398 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - feat!: Removed `configuration.tokens.fetchDecimalsFromAddress`. Instead, use `MgvToken.createTokenFromAddress` and read the decimals from that token.
 - feat!: `Mangrove.toUnits|fromUnits` no longer accepts a token name/symbol as this was ambiguous. Instead, use `MgvToken.createToken` and call `toUnits|fromUnits` on that.
 - feat!: Static token configuration getters and setters have been removed from `Mangrove`. Instead, use the methods on `MgvToken`.
+- feat!: `Mangrove.getTokenAndAddress` has been removed. Instead, use `Mangrove.tokenFromAddress` and read the address from there.
 
 # 2.0.0-4
 
diff --git a/src/kandel/kandelFarm.ts b/src/kandel/kandelFarm.ts
index fdb74906b..c4c7f55ec 100644
--- a/src/kandel/kandelFarm.ts
+++ b/src/kandel/kandelFarm.ts
@@ -86,10 +86,10 @@ class KandelFarm {
             const olKeyStruct = this.mgv.getOlKeyStruct(
               x.args.baseQuoteOlKeyHash,
             );
-            const baseToken = await this.mgv.getTokenAndAddress(
+            const baseToken = await this.mgv.tokenFromAddress(
               await olKeyStruct!.outbound_tkn,
             );
-            const quoteToken = await this.mgv.getTokenAndAddress(
+            const quoteToken = await this.mgv.tokenFromAddress(
               await olKeyStruct!.inbound_tkn,
             );
             return {
@@ -97,9 +97,9 @@ class KandelFarm {
               ownerAddress: x.args.owner,
               onAave: false,
               baseAddress: baseToken.address,
-              base: baseToken.token,
+              base: baseToken,
               quoteAddress: quoteToken.address,
-              quote: quoteToken.token,
+              quote: quoteToken,
             };
           })
         : [];
@@ -116,10 +116,10 @@ class KandelFarm {
             const olKeyStruct = this.mgv.getOlKeyStruct(
               x.args.baseQuoteOlKeyHash,
             );
-            const baseToken = await this.mgv.getTokenAndAddress(
+            const baseToken = await this.mgv.tokenFromAddress(
               await olKeyStruct!.outbound_tkn,
             );
-            const quoteToken = await this.mgv.getTokenAndAddress(
+            const quoteToken = await this.mgv.tokenFromAddress(
               await olKeyStruct!.inbound_tkn,
             );
             return {
@@ -127,9 +127,9 @@ class KandelFarm {
               ownerAddress: x.args.owner,
               onAave: true,
               baseAddress: baseToken.address,
-              base: baseToken.token,
+              base: baseToken,
               quoteAddress: quoteToken.address,
-              quote: quoteToken.token,
+              quote: quoteToken,
             };
           })
         : [];
diff --git a/src/mangrove.ts b/src/mangrove.ts
index 553af4bbc..1c35f3bc2 100644
--- a/src/mangrove.ts
+++ b/src/mangrove.ts
@@ -560,18 +560,6 @@ class Mangrove {
     );
   }
 
-  /** Gets the token corresponding to the address if it is known; otherwise, undefined.
-   */
-  async getTokenAndAddress(
-    address: string,
-  ): Promise<{ address: string; token?: MgvToken }> {
-    const name = this.getNameFromAddress(address);
-    return {
-      address,
-      token: name === undefined ? undefined : await this.token(name),
-    };
-  }
-
   /** Convert public token amount to internal token representation.
    *
    * For convenience, has a static and an instance version.