diff --git a/packages/ERTP/src/issuer.chainmail b/packages/ERTP/src/issuer.chainmail index ab09c79ac83..5cece501966 100644 --- a/packages/ERTP/src/issuer.chainmail +++ b/packages/ERTP/src/issuer.chainmail @@ -119,13 +119,13 @@ interface Brand { * default, is used for basic fungible tokens. */ interface IssuerMaker { - produceIssuer( + makeIssuerKit( allegedName :String, mathHelperName :String) -> (IssuerResults); } /** - * The return value of produceIssuer + * The return value of makeIssuerKit */ struct IssuerResults ( ) { mint :Mint; diff --git a/packages/ERTP/src/issuer.js b/packages/ERTP/src/issuer.js index cf5b142ac8a..6fcdfc0d458 100644 --- a/packages/ERTP/src/issuer.js +++ b/packages/ERTP/src/issuer.js @@ -98,7 +98,7 @@ import makeAmountMath from './amountMath'; * @typedef {Object} IssuerMaker * Makes Issuers. * - * @property {(allegedName: string, mathHelperName: string) => IssuerResults} produceIssuer + * @property {(allegedName: string, mathHelperName: string) => IssuerResults} makeIssuerKit * The allegedName becomes part of the brand in asset descriptions. The * allegedName doesn't have to be a string, but it will only be used for * its value. The allegedName is useful for debugging and double-checking @@ -109,7 +109,7 @@ import makeAmountMath from './amountMath'; * default, is used for basic fungible tokens. * * @typedef {Object} IssuerResults - * The return value of produceIssuer + * The return value of makeIssuerKit * * @property {Mint} mint * @property {Issuer} issuer @@ -229,7 +229,7 @@ import makeAmountMath from './amountMath'; * @param {string} mathHelpersName * @returns {IssuerResults} */ -function produceIssuer(allegedName, mathHelpersName = 'nat') { +function makeIssuerKit(allegedName, mathHelpersName = 'nat') { assert.typeof(allegedName, 'string'); const brand = harden({ @@ -500,6 +500,6 @@ function produceIssuer(allegedName, mathHelpersName = 'nat') { }); } -harden(produceIssuer); +harden(makeIssuerKit); -export default produceIssuer; +export default makeIssuerKit; diff --git a/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js b/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js index 9785b65b3b5..ce4909a9c04 100644 --- a/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js +++ b/packages/ERTP/test/swingsetTests/splitPayments/bootstrap.js @@ -1,11 +1,11 @@ /* global harden */ -import produceIssuer from '../../../src/issuer'; +import makeIssuerKit from '../../../src/issuer'; function build(E, log) { function testSplitPayments(aliceMaker) { log('start test splitPayments'); - const { mint: moolaMint, issuer, amountMath } = produceIssuer('moola'); + const { mint: moolaMint, issuer, amountMath } = makeIssuerKit('moola'); const moolaPayment = moolaMint.mintPayment(amountMath.make(1000)); const aliceP = E(aliceMaker).make(issuer, amountMath, moolaPayment); diff --git a/packages/ERTP/test/unitTests/test-issuerObj.js b/packages/ERTP/test/unitTests/test-issuerObj.js index d91e59d9e09..8b0ed507e69 100644 --- a/packages/ERTP/test/unitTests/test-issuerObj.js +++ b/packages/ERTP/test/unitTests/test-issuerObj.js @@ -3,17 +3,17 @@ import '@agoric/install-ses'; import test from 'tape-promise/tape'; import { E } from '@agoric/eventual-send'; -import produceIssuer from '../../src/issuer'; +import makeIssuerKit from '../../src/issuer'; test('issuer.getBrand, brand.isMyIssuer', t => { try { - const { issuer, brand } = produceIssuer('fungible'); + const { issuer, brand } = makeIssuerKit('fungible'); const myBrand = issuer.getBrand(); t.ok(myBrand.isMyIssuer(issuer)); t.equals( brand, myBrand, - 'brand returned from `produceIssuer` and from `getBrand` the same', + 'brand returned from `makeIssuerKit` and from `getBrand` the same', ); t.equals(issuer.getAllegedName(), myBrand.getAllegedName()); t.equals(issuer.getAllegedName(), 'fungible'); @@ -26,7 +26,7 @@ test('issuer.getBrand, brand.isMyIssuer', t => { test('issuer.getAmountMath', t => { try { - const { issuer, amountMath, brand } = produceIssuer('fungible'); + const { issuer, amountMath, brand } = makeIssuerKit('fungible'); t.equals(issuer.getAmountMath(), amountMath); const fungible = amountMath.make; t.ok( @@ -46,7 +46,7 @@ test('issuer.getAmountMath', t => { test('issuer.getMathHelpersName', t => { try { - const { issuer } = produceIssuer('fungible'); + const { issuer } = makeIssuerKit('fungible'); t.equals(issuer.getMathHelpersName(), 'nat'); } catch (e) { t.assert(false, e); @@ -57,7 +57,7 @@ test('issuer.getMathHelpersName', t => { test('issuer.makeEmptyPurse', t => { t.plan(6); - const { issuer, mint, amountMath, brand } = produceIssuer('fungible'); + const { issuer, mint, amountMath, brand } = makeIssuerKit('fungible'); const purse = issuer.makeEmptyPurse(); const payment = mint.mintPayment(amountMath.make(837)); @@ -104,7 +104,7 @@ test('issuer.makeEmptyPurse', t => { test('purse.deposit', async t => { t.plan(4); - const { issuer, mint, amountMath } = produceIssuer('fungible'); + const { issuer, mint, amountMath } = makeIssuerKit('fungible'); const fungible0 = amountMath.getEmpty(); const fungible17 = amountMath.make(17); const fungible25 = amountMath.make(25); @@ -139,7 +139,7 @@ test('purse.deposit', async t => { test('purse.deposit promise', t => { t.plan(1); - const { issuer, mint, amountMath } = produceIssuer('fungible'); + const { issuer, mint, amountMath } = makeIssuerKit('fungible'); const fungible25 = amountMath.make(25); const purse = issuer.makeEmptyPurse(); @@ -155,7 +155,7 @@ test('purse.deposit promise', t => { test('purse.makeDepositFacet', t => { t.plan(2); - const { issuer, mint, amountMath } = produceIssuer('fungible'); + const { issuer, mint, amountMath } = makeIssuerKit('fungible'); const fungible25 = amountMath.make(25); const purse = issuer.makeEmptyPurse(); @@ -180,7 +180,7 @@ test('purse.makeDepositFacet', t => { test('issuer.burn', t => { t.plan(2); - const { issuer, mint, amountMath } = produceIssuer('fungible'); + const { issuer, mint, amountMath } = makeIssuerKit('fungible'); const payment1 = mint.mintPayment(amountMath.make(837)); E(issuer) @@ -197,7 +197,7 @@ test('issuer.burn', t => { test('issuer.claim', t => { t.plan(3); - const { issuer, amountMath, mint } = produceIssuer('fungible'); + const { issuer, amountMath, mint } = makeIssuerKit('fungible'); const payment1 = mint.mintPayment(amountMath.make(2)); E(issuer) .claim(payment1, amountMath.make(2)) @@ -220,7 +220,7 @@ test('issuer.claim', t => { test('issuer.splitMany bad amount', t => { try { - const { mint, issuer, amountMath } = produceIssuer('fungible'); + const { mint, issuer, amountMath } = makeIssuerKit('fungible'); const payment = mint.mintPayment(amountMath.make(1000)); const badAmounts = Array(2).fill(amountMath.make(10)); t.rejects( @@ -237,7 +237,7 @@ test('issuer.splitMany bad amount', t => { test('issuer.splitMany good amount', t => { t.plan(11); - const { mint, issuer, amountMath } = produceIssuer('fungible'); + const { mint, issuer, amountMath } = makeIssuerKit('fungible'); const oldPayment = mint.mintPayment(amountMath.make(100)); const goodAmounts = Array(10).fill(amountMath.make(10)); @@ -265,8 +265,8 @@ test('issuer.splitMany good amount', t => { test('issuer.split bad amount', t => { try { - const { mint, issuer, amountMath } = produceIssuer('fungible'); - const { amountMath: otherUnitOps } = produceIssuer('other fungible'); + const { mint, issuer, amountMath } = makeIssuerKit('fungible'); + const { amountMath: otherUnitOps } = makeIssuerKit('other fungible'); const payment = mint.mintPayment(amountMath.make(1000)); t.rejects( _ => E(issuer).split(payment, otherUnitOps.make(10)), @@ -282,7 +282,7 @@ test('issuer.split bad amount', t => { test('issuer.split good amount', t => { t.plan(3); - const { mint, issuer, amountMath } = produceIssuer('fungible'); + const { mint, issuer, amountMath } = makeIssuerKit('fungible'); const oldPayment = mint.mintPayment(amountMath.make(20)); const checkPayments = splitPayments => { @@ -309,7 +309,7 @@ test('issuer.split good amount', t => { test('issuer.combine good payments', t => { t.plan(101); - const { mint, issuer, amountMath } = produceIssuer('fungible'); + const { mint, issuer, amountMath } = makeIssuerKit('fungible'); const payments = []; for (let i = 0; i < 100; i += 1) { payments.push(mint.mintPayment(amountMath.make(1))); @@ -339,7 +339,7 @@ test('issuer.combine good payments', t => { test('issuer.combine array of promises', t => { t.plan(1); - const { mint, issuer, amountMath } = produceIssuer('fungible'); + const { mint, issuer, amountMath } = makeIssuerKit('fungible'); const paymentsP = []; for (let i = 0; i < 100; i += 1) { const freshPayment = mint.mintPayment(amountMath.make(1)); @@ -361,8 +361,8 @@ test('issuer.combine array of promises', t => { test('issuer.combine bad payments', t => { try { - const { mint, issuer, amountMath } = produceIssuer('fungible'); - const { mint: otherMint, amountMath: otherAmountMath } = produceIssuer( + const { mint, issuer, amountMath } = makeIssuerKit('fungible'); + const { mint: otherMint, amountMath: otherAmountMath } = makeIssuerKit( 'other fungible', ); const payments = []; diff --git a/packages/ERTP/test/unitTests/test-mintObj.js b/packages/ERTP/test/unitTests/test-mintObj.js index 989645f93cd..4013f0e26f8 100644 --- a/packages/ERTP/test/unitTests/test-mintObj.js +++ b/packages/ERTP/test/unitTests/test-mintObj.js @@ -4,11 +4,11 @@ import '@agoric/install-ses'; import { test } from 'tape-promise/tape'; -import produceIssuer from '../../src/issuer'; +import makeIssuerKit from '../../src/issuer'; test('mint.getIssuer', t => { try { - const { mint, issuer } = produceIssuer('fungible'); + const { mint, issuer } = makeIssuerKit('fungible'); t.equals(mint.getIssuer(), issuer); } catch (e) { t.assert(false, e); @@ -19,7 +19,7 @@ test('mint.getIssuer', t => { test('mint.mintPayment default natMathHelper', t => { t.plan(2); - const { mint, issuer, amountMath } = produceIssuer('fungible'); + const { mint, issuer, amountMath } = makeIssuerKit('fungible'); const fungible1000 = amountMath.make(1000); const payment1 = mint.mintPayment(fungible1000); issuer.getAmountOf(payment1).then(paymentBalance1 => { @@ -34,7 +34,7 @@ test('mint.mintPayment default natMathHelper', t => { test('mint.mintPayment strSetMathHelpers', t => { t.plan(2); - const { mint, issuer, amountMath } = produceIssuer('items', 'strSet'); + const { mint, issuer, amountMath } = makeIssuerKit('items', 'strSet'); const items1and2and4 = amountMath.make(harden(['1', '2', '4'])); const payment1 = mint.mintPayment(items1and2and4); issuer.getAmountOf(payment1).then(paymentBalance1 => { @@ -50,7 +50,7 @@ test('mint.mintPayment strSetMathHelpers', t => { test('mint.mintPayment setMathHelpers', t => { t.plan(3); - const { mint, issuer, amountMath } = produceIssuer('items', 'set'); + const { mint, issuer, amountMath } = makeIssuerKit('items', 'set'); const item1handle = {}; const item2handle = {}; const item3handle = {}; @@ -76,7 +76,7 @@ test('mint.mintPayment setMathHelpers', t => { test('mint.mintPayment setMathHelpers with invites', t => { t.plan(2); - const { mint, issuer, amountMath } = produceIssuer('items', 'set'); + const { mint, issuer, amountMath } = makeIssuerKit('items', 'set'); const instanceHandle1 = {}; const invite1Extent = { handle: {}, instanceHandle: instanceHandle1 }; const invite2Extent = { handle: {}, instanceHandle: instanceHandle1 }; @@ -102,7 +102,7 @@ test('non-fungible tokens example', t => { mint: balletTicketMint, issuer: balletTicketIssuer, amountMath, - } = produceIssuer('Agoric Ballet Opera tickets', 'set'); + } = makeIssuerKit('Agoric Ballet Opera tickets', 'set'); const startDateString = new Date(2020, 1, 17, 20, 30).toISOString(); diff --git a/packages/cosmic-swingset/lib/ag-solo/vats/vat-mints.js b/packages/cosmic-swingset/lib/ag-solo/vats/vat-mints.js index a9a4cc32f27..9f294d24547 100644 --- a/packages/cosmic-swingset/lib/ag-solo/vats/vat-mints.js +++ b/packages/cosmic-swingset/lib/ag-solo/vats/vat-mints.js @@ -1,6 +1,6 @@ /* global harden */ -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import makeStore from '@agoric/store'; @@ -25,7 +25,7 @@ function build(_E, _log) { getMints: issuerNames => issuerNames.map(api.getMint), // For example, issuerNameSingular might be 'moola', or 'simolean' makeMintAndIssuer: issuerNameSingular => { - const { mint, issuer, amountMath } = produceIssuer(issuerNameSingular); + const { mint, issuer, amountMath } = makeIssuerKit(issuerNameSingular); mintsAndMath.init(issuerNameSingular, { mint, amountMath }); return issuer; }, diff --git a/packages/cosmic-swingset/test/unitTests/test-lib-wallet.js b/packages/cosmic-swingset/test/unitTests/test-lib-wallet.js index b011fcc0fec..c4225a5c8cd 100644 --- a/packages/cosmic-swingset/test/unitTests/test-lib-wallet.js +++ b/packages/cosmic-swingset/test/unitTests/test-lib-wallet.js @@ -6,7 +6,7 @@ import { test } from 'tape-promise/tape'; import bundleSource from '@agoric/bundle-source'; import makeAmountMath from '@agoric/ertp/src/amountMath'; -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { makeZoe } from '@agoric/zoe'; import { makeRegistrar } from '@agoric/registrar'; @@ -24,9 +24,9 @@ const setupTest = async () => { inboxStateChangeLog.push(data); }; - const moolaBundle = produceIssuer('moola'); - const simoleanBundle = produceIssuer('simolean'); - const rpgBundle = produceIssuer('rpg', 'strSet'); + const moolaBundle = makeIssuerKit('moola'); + const simoleanBundle = makeIssuerKit('simolean'); + const rpgBundle = makeIssuerKit('rpg', 'strSet'); const zoe = makeZoe(); const registry = makeRegistrar(); const board = makeBoard(); diff --git a/packages/spawner/src/contractHost.js b/packages/spawner/src/contractHost.js index abbf2883629..ff4a5e922df 100644 --- a/packages/spawner/src/contractHost.js +++ b/packages/spawner/src/contractHost.js @@ -7,7 +7,7 @@ import { importBundle } from '@agoric/import-bundle'; import makeStore from '@agoric/weak-store'; import { assert, details } from '@agoric/assert'; import { allComparable } from '@agoric/same-structure'; -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { producePromise } from '@agoric/produce-promise'; import { E, HandledPromise } from '@agoric/eventual-send'; @@ -36,7 +36,7 @@ function makeContractHost(vatPowers, additionalEndowments = {}) { mint: inviteMint, issuer: inviteIssuer, amountMath: inviteAmountMath, - } = produceIssuer('contract host', 'set'); + } = makeIssuerKit('contract host', 'set'); function redeem(allegedInvitePayment) { return inviteIssuer.getAmountOf(allegedInvitePayment).then(inviteAmount => { diff --git a/packages/spawner/test/swingsetTests/contractHost/bootstrap.js b/packages/spawner/test/swingsetTests/contractHost/bootstrap.js index 360d84864b4..c82afa18978 100644 --- a/packages/spawner/test/swingsetTests/contractHost/bootstrap.js +++ b/packages/spawner/test/swingsetTests/contractHost/bootstrap.js @@ -137,7 +137,7 @@ function build(E, log) { const { mint: moneyMint, issuer: moneyIssuer } = await E( mint, - ).produceIssuer('moola'); + ).makeIssuerKit('moola'); const moolaAmountMath = await getLocalAmountMath(moneyIssuer); const moola = moolaAmountMath.make; const aliceMoneyPaymentP = E(moneyMint).mintPayment(moola(1000)); @@ -145,7 +145,7 @@ function build(E, log) { const { mint: stockMint, issuer: stockIssuer } = await E( mint, - ).produceIssuer('Tyrell'); + ).makeIssuerKit('Tyrell'); const stockAmountMath = await getLocalAmountMath(stockIssuer); const stocks = stockAmountMath.make; const aliceStockPaymentP = E(stockMint).mintPayment(stocks(2002)); @@ -188,7 +188,7 @@ function build(E, log) { const { mint: moneyMint, issuer: moneyIssuer } = await E( mint, - ).produceIssuer('clams'); + ).makeIssuerKit('clams'); const moneyAmountMath = await getLocalAmountMath(moneyIssuer); const money = moneyAmountMath.make; const aliceMoneyPayment = await E(moneyMint).mintPayment(money(1000)); @@ -196,7 +196,7 @@ function build(E, log) { const { mint: stockMint, issuer: stockIssuer } = await E( mint, - ).produceIssuer('fudco'); + ).makeIssuerKit('fudco'); const stockAmountMath = await getLocalAmountMath(stockIssuer); const stocks = stockAmountMath.make; const aliceStockPayment = await E(stockMint).mintPayment(stocks(2002)); diff --git a/packages/spawner/test/swingsetTests/contractHost/vat-mint.js b/packages/spawner/test/swingsetTests/contractHost/vat-mint.js index b342200b097..56ea4a4fefb 100644 --- a/packages/spawner/test/swingsetTests/contractHost/vat-mint.js +++ b/packages/spawner/test/swingsetTests/contractHost/vat-mint.js @@ -2,10 +2,10 @@ /* global harden */ -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; function build(_E, _log) { - return harden({ produceIssuer }); + return harden({ makeIssuerKit }); } harden(build); diff --git a/packages/spawner/test/swingsetTests/escrow/bootstrap.js b/packages/spawner/test/swingsetTests/escrow/bootstrap.js index dd30167572e..6f3a9d52a95 100644 --- a/packages/spawner/test/swingsetTests/escrow/bootstrap.js +++ b/packages/spawner/test/swingsetTests/escrow/bootstrap.js @@ -2,7 +2,7 @@ /* global harden */ -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { allComparable } from '@agoric/same-structure'; import { assert, details } from '@agoric/assert'; @@ -175,9 +175,9 @@ function build(E, log) { const obj0 = { async bootstrap(argv, vats) { const host = await E(vats.host).makeHost(); - const { mint: randMintP } = E(vats.mint).produceIssuer('rand'); + const { mint: randMintP } = E(vats.mint).makeIssuerKit('rand'); - const { mint: artMintP } = produceIssuer('art', 'set'); + const { mint: artMintP } = makeIssuerKit('art', 'set'); switch (argv[0]) { case 'escrow misMatches': { return testEscrowServiceMismatches(host, randMintP, artMintP); diff --git a/packages/spawner/test/swingsetTests/escrow/vat-mint.js b/packages/spawner/test/swingsetTests/escrow/vat-mint.js index b342200b097..56ea4a4fefb 100644 --- a/packages/spawner/test/swingsetTests/escrow/vat-mint.js +++ b/packages/spawner/test/swingsetTests/escrow/vat-mint.js @@ -2,10 +2,10 @@ /* global harden */ -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; function build(_E, _log) { - return harden({ produceIssuer }); + return harden({ makeIssuerKit }); } harden(build); diff --git a/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js b/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js index 9149257d674..19c33881eeb 100644 --- a/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js +++ b/packages/swingset-runner/demo/exchangeBenchmark/bootstrap.js @@ -1,6 +1,6 @@ /* global harden */ -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { E } from '@agoric/eventual-send'; import { makePrintLog } from './printLog'; @@ -12,8 +12,8 @@ const log = makePrintLog(); function setupBasicMints() { // prettier-ignore const all = [ - produceIssuer('moola'), - produceIssuer('simoleans'), + makeIssuerKit('moola'), + makeIssuerKit('simoleans'), ]; const mints = all.map(objs => objs.mint); const issuers = all.map(objs => objs.issuer); diff --git a/packages/swingset-runner/demo/zoeTests/bootstrap.js b/packages/swingset-runner/demo/zoeTests/bootstrap.js index d3cd219262a..f2cf05ef2a7 100644 --- a/packages/swingset-runner/demo/zoeTests/bootstrap.js +++ b/packages/swingset-runner/demo/zoeTests/bootstrap.js @@ -1,7 +1,7 @@ /* global harden */ import { E } from '@agoric/eventual-send'; -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import buildManualTimer from './manualTimer'; import { makePrintLog } from './printLog'; @@ -20,9 +20,9 @@ const log = makePrintLog(); const setupBasicMints = () => { const all = [ - produceIssuer('moola'), - produceIssuer('simoleans'), - produceIssuer('bucks'), + makeIssuerKit('moola'), + makeIssuerKit('simoleans'), + makeIssuerKit('bucks'), ]; const mints = all.map(objs => objs.mint); const issuers = all.map(objs => objs.issuer); diff --git a/packages/zoe/src/contracts/autoswap.js b/packages/zoe/src/contracts/autoswap.js index ac67c43ff21..2f871a81ba9 100644 --- a/packages/zoe/src/contracts/autoswap.js +++ b/packages/zoe/src/contracts/autoswap.js @@ -1,7 +1,7 @@ /* global harden */ // @ts-check -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; // Eventually will be importable from '@agoric/zoe-contract-support' import { @@ -31,7 +31,7 @@ const makeContract = zcf => { mint: liquidityMint, issuer: liquidityIssuer, amountMath: liquidityAmountMath, - } = produceIssuer('liquidity'); + } = makeIssuerKit('liquidity'); let liqTokenSupply = 0; diff --git a/packages/zoe/src/contracts/mintAndSellNFT.js b/packages/zoe/src/contracts/mintAndSellNFT.js index 699b4f5692f..ccd30583875 100644 --- a/packages/zoe/src/contracts/mintAndSellNFT.js +++ b/packages/zoe/src/contracts/mintAndSellNFT.js @@ -1,7 +1,7 @@ /* global harden */ // @ts-check -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; /** * This contract mints non-fungible tokens and creates a selling contract @@ -29,7 +29,7 @@ const makeContract = zcf => { const { tokenName = 'token' } = terms; // Create the internal token mint - const { issuer, mint, amountMath: tokenAmountMath } = produceIssuer( + const { issuer, mint, amountMath: tokenAmountMath } = makeIssuerKit( tokenName, 'set', ); diff --git a/packages/zoe/src/contracts/mintPayments.js b/packages/zoe/src/contracts/mintPayments.js index 849b4b79980..1a3868403fb 100644 --- a/packages/zoe/src/contracts/mintPayments.js +++ b/packages/zoe/src/contracts/mintPayments.js @@ -3,7 +3,7 @@ /* eslint-disable no-use-before-define */ // @ts-check -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { makeZoeHelpers } from '../contractSupport'; /** @@ -24,7 +24,7 @@ import { makeZoeHelpers } from '../contractSupport'; */ const makeContract = zcf => { // Create the internal token mint for a fungible digital asset - const { issuer, mint, amountMath } = produceIssuer('tokens'); + const { issuer, mint, amountMath } = makeIssuerKit('tokens'); const zoeHelpers = makeZoeHelpers(zcf); diff --git a/packages/zoe/src/contracts/multipoolAutoswap.js b/packages/zoe/src/contracts/multipoolAutoswap.js index 66ac85a3e07..548f8ef3130 100644 --- a/packages/zoe/src/contracts/multipoolAutoswap.js +++ b/packages/zoe/src/contracts/multipoolAutoswap.js @@ -2,7 +2,7 @@ // @ts-check /* eslint-disable no-use-before-define */ -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { assert, details } from '@agoric/assert'; import { makeTable, makeValidateProperties } from '../table'; @@ -118,7 +118,7 @@ const makeContract = zcf => { mint: liquidityMint, issuer: liquidityIssuer, brand: liquidityBrand, - } = produceIssuer(newLiquidityKeyword); + } = makeIssuerKit(newLiquidityKeyword); return Promise.all([ zcf.addNewIssuer(newTokenIssuer, newTokenKeyword), makeEmptyOffer(), diff --git a/packages/zoe/src/evalContractCode.js b/packages/zoe/src/evalContractCode.js index ccb117814b2..57d12816196 100644 --- a/packages/zoe/src/evalContractCode.js +++ b/packages/zoe/src/evalContractCode.js @@ -2,7 +2,7 @@ import Nat from '@agoric/nat'; -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { assert } from '@agoric/assert'; import { producePromise } from '@agoric/produce-promise'; import { sameStructure } from '@agoric/same-structure'; @@ -29,7 +29,7 @@ const evalContractBundle = (bundle, additionalEndowments, vatPowers) => { console: louderConsole, harden, Nat, - produceIssuer, + makeIssuerKit, producePromise, sameStructure, HandledPromise, diff --git a/packages/zoe/src/zoe.js b/packages/zoe/src/zoe.js index 11ecea32375..2b181666ce5 100644 --- a/packages/zoe/src/zoe.js +++ b/packages/zoe/src/zoe.js @@ -3,7 +3,7 @@ import { E, HandledPromise } from '@agoric/eventual-send'; import makeStore from '@agoric/weak-store'; -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { assert, details, q } from '@agoric/assert'; import { produceNotifier } from '@agoric/notifier'; import { producePromise } from '@agoric/produce-promise'; @@ -346,7 +346,7 @@ function makeZoe(additionalEndowments = {}, vatPowers = {}) { mint: inviteMint, issuer: inviteIssuer, amountMath: inviteAmountMath, - } = produceIssuer('zoeInvite', 'set'); + } = makeIssuerKit('zoeInvite', 'set'); // All of the Zoe state is stored in these tables built on WeakMaps const { diff --git a/packages/zoe/test/swingsetTests/zoe/bootstrap.js b/packages/zoe/test/swingsetTests/zoe/bootstrap.js index 4d2939a9bed..51edbdc7848 100644 --- a/packages/zoe/test/swingsetTests/zoe/bootstrap.js +++ b/packages/zoe/test/swingsetTests/zoe/bootstrap.js @@ -1,6 +1,6 @@ /* global harden */ -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import buildManualTimer from '../../../tools/manualTimer'; /* eslint-disable import/no-unresolved, import/extensions */ @@ -16,9 +16,9 @@ import mintAndSellNFTBundle from './bundle-mintAndSellNFT'; const setupBasicMints = () => { const all = [ - produceIssuer('moola'), - produceIssuer('simoleans'), - produceIssuer('bucks'), + makeIssuerKit('moola'), + makeIssuerKit('simoleans'), + makeIssuerKit('bucks'), ]; const mints = all.map(objs => objs.mint); const issuers = all.map(objs => objs.issuer); diff --git a/packages/zoe/test/unitTests/contracts/test-mintPayments.js b/packages/zoe/test/unitTests/contracts/test-mintPayments.js index a2a70520b17..90b2bfbe917 100644 --- a/packages/zoe/test/unitTests/contracts/test-mintPayments.js +++ b/packages/zoe/test/unitTests/contracts/test-mintPayments.js @@ -7,7 +7,7 @@ import { test } from 'tape-promise/tape'; import bundleSource from '@agoric/bundle-source'; import { E } from '@agoric/eventual-send'; -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { makeZoe } from '../../../src/zoe'; @@ -62,8 +62,8 @@ test('zoe - mint payments with unrelated give and want', async t => { const installationHandle = await E(zoe).install(bundle); const inviteIssuer = await E(zoe).getInviteIssuer(); - const moolaBundle = produceIssuer('moola'); - const simoleanBundle = produceIssuer('simolean'); + const moolaBundle = makeIssuerKit('moola'); + const simoleanBundle = makeIssuerKit('simolean'); // Alice creates a contract instance const issuerKeywordRecord = harden({ diff --git a/packages/zoe/test/unitTests/contracts/test-multipoolAutoswap.js b/packages/zoe/test/unitTests/contracts/test-multipoolAutoswap.js index 9f40609b9c3..9a0c01745c2 100644 --- a/packages/zoe/test/unitTests/contracts/test-multipoolAutoswap.js +++ b/packages/zoe/test/unitTests/contracts/test-multipoolAutoswap.js @@ -7,7 +7,7 @@ import { test } from 'tape-promise/tape'; import bundleSource from '@agoric/bundle-source'; import makeAmountMath from '@agoric/ertp/src/amountMath'; -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { E } from '@agoric/eventual-send'; import { makeZoe } from '../../../src/zoe'; @@ -23,7 +23,7 @@ test('multipoolAutoSwap with valid offers', async t => { const inviteIssuer = zoe.getInviteIssuer(); // Set up central token - const centralR = produceIssuer('central'); + const centralR = makeIssuerKit('central'); const centralTokens = centralR.amountMath.make; // Setup Alice diff --git a/packages/zoe/test/unitTests/contracts/test-sellTickets.js b/packages/zoe/test/unitTests/contracts/test-sellTickets.js index 1e87d048e54..a183ec9632e 100644 --- a/packages/zoe/test/unitTests/contracts/test-sellTickets.js +++ b/packages/zoe/test/unitTests/contracts/test-sellTickets.js @@ -6,7 +6,7 @@ import '@agoric/install-ses'; import { test } from 'tape-promise/tape'; // eslint-disable-next-line import/no-extraneous-dependencies import bundleSource from '@agoric/bundle-source'; -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { E } from '@agoric/eventual-send'; import { makeZoe } from '../../../src/zoe'; @@ -27,7 +27,7 @@ test(`mint and sell tickets for multiple shows`, async t => { const sellItemsBundle = await bundleSource(sellItemsRoot); const sellItemsInstallationHandle = await E(zoe).install(sellItemsBundle); - const { issuer: moolaIssuer, amountMath: moolaAmountMath } = produceIssuer( + const { issuer: moolaIssuer, amountMath: moolaAmountMath } = makeIssuerKit( 'moola', ); @@ -149,7 +149,7 @@ test(`mint and sell opera tickets`, async t => { mint: moolaMint, issuer: moolaIssuer, amountMath: { make: moola }, - } = produceIssuer('moola'); + } = makeIssuerKit('moola'); const zoe = makeZoe(); diff --git a/packages/zoe/test/unitTests/setupBasicMints.js b/packages/zoe/test/unitTests/setupBasicMints.js index 71df988839a..018bcc4dff7 100644 --- a/packages/zoe/test/unitTests/setupBasicMints.js +++ b/packages/zoe/test/unitTests/setupBasicMints.js @@ -1,11 +1,11 @@ /* global harden */ -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; const setup = () => { - const moolaBundle = produceIssuer('moola'); - const simoleanBundle = produceIssuer('simoleans'); - const bucksBundle = produceIssuer('bucks'); + const moolaBundle = makeIssuerKit('moola'); + const simoleanBundle = makeIssuerKit('simoleans'); + const bucksBundle = makeIssuerKit('bucks'); const allBundles = { moola: moolaBundle, simoleans: simoleanBundle, diff --git a/packages/zoe/test/unitTests/setupMixedMints.js b/packages/zoe/test/unitTests/setupMixedMints.js index d05e002c03c..9044dcdeab8 100644 --- a/packages/zoe/test/unitTests/setupMixedMints.js +++ b/packages/zoe/test/unitTests/setupMixedMints.js @@ -1,10 +1,10 @@ /* global harden */ -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; const setupMixed = () => { - const ccBundle = produceIssuer('CryptoCats', 'strSet'); - const moolaBundle = produceIssuer('moola'); + const ccBundle = makeIssuerKit('CryptoCats', 'strSet'); + const moolaBundle = makeIssuerKit('moola'); const allBundles = { cc: ccBundle, moola: moolaBundle }; const mints = new Map(); const issuers = new Map(); diff --git a/packages/zoe/test/unitTests/setupNonFungibleMints.js b/packages/zoe/test/unitTests/setupNonFungibleMints.js index 43e0fb857a7..83e1cf518b1 100644 --- a/packages/zoe/test/unitTests/setupNonFungibleMints.js +++ b/packages/zoe/test/unitTests/setupNonFungibleMints.js @@ -1,10 +1,10 @@ /* global harden */ -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; const setupNonFungible = () => { - const ccBundle = produceIssuer('CryptoCats', 'strSet'); - const rpgBundle = produceIssuer('MMORPG Items', 'set'); + const ccBundle = makeIssuerKit('CryptoCats', 'strSet'); + const rpgBundle = makeIssuerKit('MMORPG Items', 'set'); const allBundles = { cc: ccBundle, rpg: rpgBundle }; const mints = new Map(); const issuers = new Map(); diff --git a/packages/zoe/test/unitTests/test-rightsConservation.js b/packages/zoe/test/unitTests/test-rightsConservation.js index ac9cd477c55..4a1fc47c486 100644 --- a/packages/zoe/test/unitTests/test-rightsConservation.js +++ b/packages/zoe/test/unitTests/test-rightsConservation.js @@ -3,13 +3,13 @@ import '@agoric/install-ses'; import { test } from 'tape-promise/tape'; import makeStore from '@agoric/weak-store'; -import produceIssuer from '@agoric/ertp'; +import makeIssuerKit from '@agoric/ertp'; import { areRightsConserved } from '../../src/rightsConservation'; const setupAmountMaths = () => { - const moolaIssuerResults = produceIssuer('moola'); - const simoleanIssuerResults = produceIssuer('simoleans'); - const bucksIssuerResults = produceIssuer('bucks'); + const moolaIssuerResults = makeIssuerKit('moola'); + const simoleanIssuerResults = makeIssuerKit('simoleans'); + const bucksIssuerResults = makeIssuerKit('bucks'); const all = [moolaIssuerResults, simoleanIssuerResults, bucksIssuerResults]; const amountMathArray = all.map(objs => objs.amountMath);