refactor: account kit exos

Agoric · Apr 29, 2024 · edf6c51 · edf6c51
1 parent 6382c03
commit edf6c51
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/packages/orchestration/src/examples/stakeAtom.contract.js b/packages/orchestration/src/examples/stakeAtom.contract.js
@@ -7,7 +7,7 @@ import { makeDurableZone } from '@agoric/zone/durable.js';
 import { V as E } from '@agoric/vat-data/vow.js';
 import { M } from '@endo/patterns';
 import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport';
-import { prepareStakingAccountHolder } from '../contracts/stakingAccountHolder.js';
+import { prepareStakingAccountKit } from '../exos/stakingAccountKit.js';
 
 const trace = makeTracer('StakeAtom');
 /**
@@ -41,7 +41,7 @@ export const start = async (zcf, privateArgs, baggage) => {
 
   const { makeRecorderKit } = prepareRecorderKitMakers(baggage, marshaller);
 
-  const makeStakingAccountHolder = prepareStakingAccountHolder(
+  const makeStakingAccountKit = prepareStakingAccountKit(
     baggage,
     makeRecorderKit,
     zcf,
@@ -54,7 +54,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     );
     const accountAddress = await E(account).getAccountAddress();
     trace('account address', accountAddress);
-    const { holder, invitationMakers } = makeStakingAccountHolder(
+    const { holder, invitationMakers } = makeStakingAccountKit(
       account,
       storageNode,
       accountAddress,

diff --git a/packages/orchestration/src/examples/stakeBld.contract.js b/packages/orchestration/src/examples/stakeBld.contract.js
@@ -10,7 +10,7 @@ import { M } from '@endo/patterns';
 import { E } from '@endo/far';
 import { prepareRecorderKitMakers } from '@agoric/zoe/src/contractSupport/recorder.js';
 import { atomicTransfer } from '@agoric/zoe/src/contractSupport/atomicTransfer.js';
-import { prepareAccountHolder } from '../contracts/localchainAccountHolder.js';
+import { prepareLocalchainAccountKit } from '../exos/localchainAccountKit.js';
 
 const trace = makeTracer('StakeBld');
 
@@ -35,7 +35,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     baggage,
     privateArgs.marshaller,
   );
-  const makeAccountHolderKit = prepareAccountHolder(
+  const makeLocalchainAccountKit = prepareLocalchainAccountKit(
     baggage,
     makeRecorderKit,
     zcf,
@@ -56,7 +56,7 @@ export const start = async (zcf, privateArgs, baggage) => {
           await E(lcaSeatKit.userSeat).tryExit();
           trace('awaiting payouts');
           const payouts = await E(lcaSeatKit.userSeat).getPayouts();
-          const { holder, invitationMakers } = makeAccountHolderKit(
+          const { holder, invitationMakers } = makeLocalchainAccountKit(
             account,
             privateArgs.storageNode,
           );

diff --git a/.../src/contracts/localchainAccountHolder.js → ...stration/src/exos/localchainAccountKit.js b/.../src/contracts/localchainAccountHolder.js → ...stration/src/exos/localchainAccountKit.js
@@ -40,7 +40,7 @@ const PUBLIC_TOPICS = {
  * @param {import('@agoric/zoe/src/contractSupport/recorder.js').MakeRecorderKit} makeRecorderKit
  * @param {ZCF} zcf
  */
-export const prepareAccountHolder = (baggage, makeRecorderKit, zcf) => {
+export const prepareLocalchainAccountKit = (baggage, makeRecorderKit, zcf) => {
   const makeAccountHolderKit = prepareExoClassKit(
     baggage,
     'Account Holder',
@@ -152,3 +152,4 @@ export const prepareAccountHolder = (baggage, makeRecorderKit, zcf) => {
   );
   return makeAccountHolderKit;
 };
+/** @typedef {ReturnType<ReturnType<typeof prepareLocalchainAccountKit>>} LocalchainAccountKit */
diff --git a/...ion/src/contracts/stakingAccountHolder.js → ...chestration/src/exos/stakingAccountKit.js b/...ion/src/contracts/stakingAccountHolder.js → ...chestration/src/exos/stakingAccountKit.js
@@ -54,8 +54,8 @@ const PUBLIC_TOPICS = {
  * @param {MakeRecorderKit} makeRecorderKit
  * @param {ZCF} zcf
  */
-export const prepareStakingAccountHolder = (baggage, makeRecorderKit, zcf) => {
-  const makeAccountHolderKit = prepareExoClassKit(
+export const prepareStakingAccountKit = (baggage, makeRecorderKit, zcf) => {
+  const makeStakingAccountKit = prepareExoClassKit(
     baggage,
     'Staking Account Holder',
     {
@@ -193,5 +193,6 @@ export const prepareStakingAccountHolder = (baggage, makeRecorderKit, zcf) => {
       },
     },
   );
-  return makeAccountHolderKit;
+  return makeStakingAccountKit;
 };
+/** @typedef {ReturnType<ReturnType<typeof prepareStakingAccountKit>>} StakingAccountKit */