Rename helper

penumbra-zone · Mar 25, 2024 · f5a720d · f5a720d
1 parent 9989451
commit f5a720d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/...tody/authorize/assert-valid-swaps.test.ts → ...-addresses-belong-to-current-user.test.ts b/...tody/authorize/assert-valid-swaps.test.ts → ...-addresses-belong-to-current-user.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { assertValidSwaps } from './assert-valid-swaps';
+import { assertSwapClaimAddressesBelongToCurrentUser } from './assert-swap-claim-addresses-belong-to-current-user';
 import {
   ActionPlan,
   TransactionPlan,
@@ -64,10 +64,12 @@ const swapWithUndefinedAddress = new ActionPlan({
 const mockIsControlledAddress = (address?: Address) =>
   !!address && [currentUserAddress1, currentUserAddress2].includes(address);
 
-describe('assertValidSwaps()', () => {
+describe('assertSwapClaimAddressesBelongToCurrentUser()', () => {
   describe('when the transaction plan has no swaps', () => {
     it('does not throw', () => {
-      expect(() => assertValidSwaps(new TransactionPlan(), mockIsControlledAddress)).not.toThrow();
+      expect(() =>
+        assertSwapClaimAddressesBelongToCurrentUser(new TransactionPlan(), mockIsControlledAddress),
+      ).not.toThrow();
     });
   });
 
@@ -78,7 +80,9 @@ describe('assertValidSwaps()', () => {
           actions: [swapWithCurrentUserAddress1, swapWithCurrentUserAddress2],
         });
 
-        expect(() => assertValidSwaps(plan, mockIsControlledAddress)).not.toThrow();
+        expect(() =>
+          assertSwapClaimAddressesBelongToCurrentUser(plan, mockIsControlledAddress),
+        ).not.toThrow();
       });
     });
 
@@ -91,7 +95,7 @@ describe('assertValidSwaps()', () => {
         expect.assertions(2);
 
         try {
-          assertValidSwaps(plan, mockIsControlledAddress);
+          assertSwapClaimAddressesBelongToCurrentUser(plan, mockIsControlledAddress);
         } catch (error) {
           expect(error).toBeInstanceOf(ConnectError);
           expect((error as ConnectError).code).toBe(Code.PermissionDenied);
@@ -108,7 +112,7 @@ describe('assertValidSwaps()', () => {
         expect.assertions(2);
 
         try {
-          assertValidSwaps(plan, mockIsControlledAddress);
+          assertSwapClaimAddressesBelongToCurrentUser(plan, mockIsControlledAddress);
         } catch (error) {
           expect(error).toBeInstanceOf(ConnectError);
           expect((error as ConnectError).code).toBe(Code.PermissionDenied);

diff --git a/...c/custody/authorize/assert-valid-swaps.ts → ...claim-addresses-belong-to-current-user.ts b/...c/custody/authorize/assert-valid-swaps.ts → ...claim-addresses-belong-to-current-user.ts
@@ -2,7 +2,7 @@ import { Address } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/k
 import { TransactionPlan } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/transaction/v1/transaction_pb';
 import { Code, ConnectError } from '@connectrpc/connect';
 
-export const assertValidSwaps = (
+export const assertSwapClaimAddressesBelongToCurrentUser = (
   plan: TransactionPlan,
   isControlledAddress: (address?: Address) => boolean,
 ): void => {

diff --git a/packages/router/src/grpc/custody/authorize/index.ts b/packages/router/src/grpc/custody/authorize/index.ts
@@ -7,7 +7,7 @@ import { Key } from '@penumbra-zone/crypto-web/src/encryption';
 import { Code, ConnectError } from '@connectrpc/connect';
 import { Box } from '@penumbra-zone/types/src/box';
 import { UserChoice } from '@penumbra-zone/types/src/user-choice';
-import { assertValidSwaps } from './assert-valid-swaps';
+import { assertSwapClaimAddressesBelongToCurrentUser } from './assert-swap-claim-addresses-belong-to-current-user';
 import { isControlledAddress } from '@penumbra-zone/wasm/src/address';
 
 export const authorize: Impl['authorize'] = async (req, ctx) => {
@@ -19,7 +19,9 @@ export const authorize: Impl['authorize'] = async (req, ctx) => {
   const walletServices = await ctx.values.get(servicesCtx).getWalletServices();
 
   const { fullViewingKey } = walletServices.viewServer;
-  assertValidSwaps(req.plan, address => isControlledAddress(fullViewingKey, address));
+  assertSwapClaimAddressesBelongToCurrentUser(req.plan, address =>
+    isControlledAddress(fullViewingKey, address),
+  );
 
   if (!approveReq) throw new ConnectError('Approver not found', Code.Unavailable);