Merge pull request #95 from balancer/refactor-tests

Refactor tests
balancer · Sep 21, 2023 · 346cb9d · 346cb9d
2 parents 5ea7e26 + ccef327
commit 346cb9d
Show file tree

Hide file tree

Showing 4 changed files with 328 additions and 415 deletions.
diff --git a/src/entities/join/weighted/weightedJoin.ts b/src/entities/join/weighted/weightedJoin.ts
@@ -32,7 +32,7 @@ export class WeightedJoin implements BaseJoin {
 
         const userData = this.encodeUserData(input.kind, amounts);
 
-        const queryArgs = parseJoinArgs({
+        const { args, tokensIn } = parseJoinArgs({
             useNativeAssetAsWrappedAmountIn:
                 !!input.useNativeAssetAsWrappedAmountIn,
             chainId: input.chainId,
@@ -48,14 +48,14 @@ export class WeightedJoin implements BaseJoin {
         const queryResult = await doQueryJoin(
             input.rpcUrl,
             input.chainId,
-            queryArgs,
+            args,
         );
 
         const bpt = new Token(input.chainId, poolState.address, 18);
         const bptOut = TokenAmount.fromRawAmount(bpt, queryResult.bptOut);
 
         const amountsIn = queryResult.amountsIn.map((a, i) =>
-            TokenAmount.fromRawAmount(sortedTokens[i], a),
+            TokenAmount.fromRawAmount(tokensIn[i], a),
         );
 
         return {
@@ -79,7 +79,7 @@ export class WeightedJoin implements BaseJoin {
 
         const userData = this.encodeUserData(input.joinKind, amounts);
 
-        const args = parseJoinArgs({
+        const { args } = parseJoinArgs({
             ...input,
             sortedTokens: input.amountsIn.map((a) => a.token),
             maxAmountsIn: amounts.maxAmountsIn,

diff --git a/src/entities/utils/parseJoinArgs.ts b/src/entities/utils/parseJoinArgs.ts
@@ -36,5 +36,8 @@ export function parseJoinArgs({
         fromInternalBalance,
     };
 
-    return [poolId, sender, recipient, joinPoolRequest] as const;
+    return {
+        args: [poolId, sender, recipient, joinPoolRequest] as const,
+        tokensIn,
+    };
 }