diff --git a/packages/dapp-svelte-wallet/api/src/lib-dehydrate.js b/packages/dapp-svelte-wallet/api/src/lib-dehydrate.js index 694579104fe..b6dbbd66e39 100644 --- a/packages/dapp-svelte-wallet/api/src/lib-dehydrate.js +++ b/packages/dapp-svelte-wallet/api/src/lib-dehydrate.js @@ -202,10 +202,7 @@ export const makeDehydrator = (initialUnnamedCount = 0) => { !petnameToVal.has(petname), details`petname ${petname} is already in use`, ); - assert( - !valToPetname.has(val), - details`val ${val} already has a strong name`, - ); + assert(!valToPetname.has(val), details`val ${val} already has a petname`); petnameToVal.init(petname, val); valToPetname.init(val, petname); diff --git a/packages/dapp-svelte-wallet/api/src/lib-wallet.js b/packages/dapp-svelte-wallet/api/src/lib-wallet.js index 9c398c1a82e..c81e582c675 100644 --- a/packages/dapp-svelte-wallet/api/src/lib-wallet.js +++ b/packages/dapp-svelte-wallet/api/src/lib-wallet.js @@ -1136,29 +1136,26 @@ export async function makeWallet({ ); } - function renameIssuer(petname, issuer) { + async function renameIssuer(petname, issuer) { assert( brandTable.hasByIssuer(issuer), `issuer has not been previously added`, ); const brandRecord = brandTable.getByIssuer(issuer); brandMapping.renamePetname(petname, brandRecord.brand); - // We don't wait for the update before returning. - updateAllState(); + await updateAllState(); return `issuer ${q(petname)} successfully renamed in wallet`; } - function renameInstance(petname, instance) { + async function renameInstance(petname, instance) { instanceMapping.renamePetname(petname, instance); - // We don't wait for the update before returning. - updateAllState(); + await updateAllState(); return `instance ${q(petname)} successfully renamed in wallet`; } - function renameInstallation(petname, installation) { + async function renameInstallation(petname, installation) { installationMapping.renamePetname(petname, installation); - // We don't wait for the update before returning. - updateAllState(); + await updateAllState(); return `installation ${q(petname)} successfully renamed in wallet`; } diff --git a/packages/dapp-svelte-wallet/api/test/test-lib-dehydrate.js b/packages/dapp-svelte-wallet/api/test/test-lib-dehydrate.js index 0acf9c02717..2a3ec349e12 100644 --- a/packages/dapp-svelte-wallet/api/test/test-lib-dehydrate.js +++ b/packages/dapp-svelte-wallet/api/test/test-lib-dehydrate.js @@ -18,12 +18,12 @@ test('makeDehydrator', async t => { instanceHandleMapping.addPetname('automaticRefund', handle3); console.log(`ERROR EXPECTED 'already has a petname' >>>>`); t.throws(() => instanceHandleMapping.addPetname('simpleExchange2', handle1), { - message: `cannot add a second petname for the same value`, + message: /val \(an object\) already has a petname/, }); console.log(`ERROR EXPECTED 'petname simpleExchange is already in use' >>>>`); t.throws( () => instanceHandleMapping.addPetname('simpleExchange', harden({})), - { message: `cannot add another value for the same petname` }, + { message: /petname \(a string\) is already in use/ }, ); // Test renaming. diff --git a/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js b/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js index ba982b5e1fc..84cebae1810 100644 --- a/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js +++ b/packages/dapp-svelte-wallet/api/test/test-lib-wallet.js @@ -202,7 +202,7 @@ test('lib-wallet issuer and purse methods', async t => { }); test('lib-wallet dapp suggests issuer, instance, installation petnames', async t => { - t.plan(14); + t.plan(13); const { board, zoe, @@ -438,7 +438,6 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t // `resuggesting a petname doesn't error` await wallet.suggestInstallation('autoswap', autoswapInstallationBoardId); - await wallet.renameInstallation('automaticRefund2', installation); t.is( @@ -449,7 +448,6 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t // We need this await for the pursesStateChangeLog to be updated // by the time we check it. - // TODO: check the pursesState changes in a less fragile way. const currentAmount2 = await E(zoeInvitePurse).getCurrentAmount(); t.deepEqual( currentAmount2.value, @@ -490,7 +488,7 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t { kind: 'brand', petname: 'zoe invite' }, { kind: 'unnamed', petname: 'unnamed-4' }, { kind: 'instance', petname: 'automaticRefund' }, - { kind: 'installation', petname: 'automaticRefund' }, + { kind: 'installation', petname: 'automaticRefund2' }, ], }, currentAmount: { @@ -502,7 +500,7 @@ test('lib-wallet dapp suggests issuer, instance, installation petnames', async t instance: { kind: 'instance', petname: 'automaticRefund' }, installation: { kind: 'installation', - petname: 'automaticRefund', + petname: 'automaticRefund2', }, }, ], diff --git a/packages/dapp-svelte-wallet/package.json b/packages/dapp-svelte-wallet/package.json index 82fcbb8af71..354d852ad61 100644 --- a/packages/dapp-svelte-wallet/package.json +++ b/packages/dapp-svelte-wallet/package.json @@ -2,6 +2,8 @@ "name": "@agoric/dapp-svelte-wallet", "version": "0.1.0", "main": "index.js", + "license": "Apache-2.0", + "author": "Agoric", "agoric-wallet": { "htmlBasedir": "./ui/public/wallet", "deploy": [