Merge master

across-protocol · Feb 15, 2024 · 0a0e476 · 0a0e476
1 parent a7a700e
commit 0a0e476
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 27 deletions.
diff --git a/test/utils/SpokePoolUtils.ts b/test/utils/SpokePoolUtils.ts
@@ -44,26 +44,4 @@ export function v2FillFromDeposit(deposit: V2DepositWithBlock, relayer: string):
   };
 
   return fill;
-}
-
-export function v3FillFromDeposit(deposit: V3DepositWithBlock, relayer: string): V3Fill {
-  const { blockNumber, transactionHash, transactionIndex, ...partialDeposit } = deposit;
-  const { recipient, message } = partialDeposit;
-
-  const fill: V3Fill = {
-    ...partialDeposit,
-    relayer,
-
-    // Caller can modify these later.
-    exclusiveRelayer: relayer,
-    repaymentChainId: deposit.destinationChainId,
-    relayExecutionInfo: {
-      recipient: deposit.updatedRecipient ?? recipient,
-      message: deposit.updatedMessage ?? message,
-      outputAmount: deposit.updatedOutputAmount ?? deposit.outputAmount,
-      fillType: FillType.FastFill,
-    },
-  };
-
-  return fill;
-}
+}
diff --git a/test/utils/utils.ts b/test/utils/utils.ts
@@ -444,10 +444,10 @@ export async function fillV3Relay(
     exclusiveRelayer: args.exclusiveRelayer,
     relayer: args.relayer,
     repaymentChainId: Number(args.repaymentChainId),
-    updatableRelayData: {
-      recipient: args.relayExecutionInfo.recipient,
-      message: args.relayExecutionInfo.message,
-      outputAmount: args.relayExecutionInfo.outputAmount,
+    relayExecutionInfo: {
+      updatedRecipient: args.relayExecutionInfo.recipient,
+      updatedMessage: args.relayExecutionInfo.message,
+      updatedOutputAmount: args.relayExecutionInfo.outputAmount,
       fillType: args.relayExecutionInfo.fillType,
     },
     blockNumber,