refactor(smart-wallet): contract start terms

Agoric · Aug 24, 2022 · ae60a0f · ae60a0f
1 parent f9ea0a6
commit ae60a0f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/packages/wallet/contract/src/singleWallet.js b/packages/wallet/contract/src/singleWallet.js
@@ -15,11 +15,11 @@ const { assign, entries, keys, fromEntries } = Object;
 
 /**
  * @typedef {{
- *   agoricNames: NameHub,
- *   bank: import('@agoric/vats/src/vat-bank').Bank,
- *   board: Board,
+ *   agoricNames: ERef<NameHub>,
+ *   bank: ERef<import('@agoric/vats/src/vat-bank').Bank>,
+ *   board: ERef<Board>,
  *   myAddressNameAdmin: ERef<MyAddressNameAdmin>,
- *   namesByAddress: NameHub,
+ *   namesByAddress: ERef<NameHub>,
  * }} SmartWalletContractTerms
  */
 

diff --git a/packages/wallet/contract/src/smartWallet.js b/packages/wallet/contract/src/smartWallet.js
@@ -16,9 +16,9 @@ const { assign, entries, keys, fromEntries } = Object;
  * myAddressNameAdmin: ERef<MyAddressNameAdmin>,
  * }} unique
  * @param {{
- * agoricNames: NameHub,
- * board: Board
- * namesByAddress: NameHub,
+ * agoricNames: ERef<NameHub>,
+ * board: ERef<Board>,
+ * namesByAddress: ERef<NameHub>,
  * storageNode: ERef<StorageNode>,
  * zoe: ERef<ZoeService>,
  * }} shared

diff --git a/packages/wallet/contract/src/walletFactory.js b/packages/wallet/contract/src/walletFactory.js
@@ -16,9 +16,9 @@ import { makeSmartWallet } from './smartWallet.js';
 
 /**
  * @typedef {{
- *   agoricNames: NameHub,
- *   board: Board,
- *   namesByAddress: NameHub,
+ *   agoricNames: ERef<NameHub>,
+ *   board: ERef<Board>,
+ *   namesByAddress: ERef<NameHub>,
  * }} SmartWalletContractTerms
  *
  * @typedef {{

diff --git a/packages/wallet/contract/test/test-singleWallet.js b/packages/wallet/contract/test/test-singleWallet.js
@@ -53,7 +53,6 @@ const makeTestContext = async t => {
     'singleWallet',
   );
   /** @type {Promise<Installation<import('../src/singleWallet.js').start>>} */
-  // @ts-expect-error cast
   const installation = E(zoe).install(bundle);
   // #endregion
 

diff --git a/packages/wallet/contract/test/test-walletFactory.js b/packages/wallet/contract/test/test-walletFactory.js
@@ -54,7 +54,6 @@ const makeTestContext = async t => {
     'walletFactory',
   );
   /** @type {Promise<Installation<import('../src/walletFactory.js').start>>} */
-  // @ts-expect-error case
   const installation = E(zoe).install(bundle);
   // #endregion
 
@@ -63,7 +62,6 @@ const makeTestContext = async t => {
     consume.chainStorage,
     'wallet',
   );
-  const marshaller = E(consume.board).getPublishingMarshaller();
 
   const walletFactory = E(zoe).startInstance(
     installation,
@@ -73,7 +71,7 @@ const makeTestContext = async t => {
       namesByAddress: consume.namesByAddress,
       board: consume.board,
     },
-    { storageNode, marshaller },
+    { storageNode },
   );
 
   return {