Remove Test Util (#65)

.github/workflows/checks.yml

@@ -29,5 +29,5 @@ jobs:
           cache-dependency-path: package-lock.json
           node-version: 21.x
       - run: npm ci
-      - run: npm run build
+      - run: npm run check
       - run: npm run test

FungibleToken.test.ts

@@ -1,5 +1,5 @@
 import { equal, rejects } from "node:assert"
-import { before, describe, it } from "node:test"
+import { describe, it } from "node:test"
 import {
   AccountUpdate,
   AccountUpdateForest,
@@ -16,71 +16,46 @@ import {
   UInt64,
   UInt8,
 } from "o1js"
-import { TestPublicKey } from "o1js/dist/node/lib/mina/local-blockchain.js"
 import {
   FungibleToken,
   FungibleTokenAdmin,
   FungibleTokenAdminBase,
   FungibleTokenAdminDeployProps,
 } from "./index.js"
-import { newTestPublicKey } from "./test_util.js"
 
-const proofsEnabled = true
+const proofsEnabled = process.argv.indexOf("--proofs-disabled") === -1
 
 const localChain = await Mina.LocalBlockchain({
-  proofsEnabled: proofsEnabled,
+  proofsEnabled,
   enforceTransactionLimits: false,
 })
 Mina.setActiveInstance(localChain)
 
-describe("token integration", () => {
-  let deployer: TestPublicKey
-  let sender: TestPublicKey
-  let receiver: TestPublicKey
-  let tokenAdmin: TestPublicKey
-  let tokenAdminContract: FungibleTokenAdmin
-  let newTokenAdmin: TestPublicKey
-  let newTokenAdminContract: FungibleTokenAdmin
-  let tokenA: TestPublicKey
-  let tokenAContract: FungibleToken
-  let tokenBAdmin: TestPublicKey
-  let tokenBAdminContract: CustomTokenAdmin
-  let tokenB: TestPublicKey
-  let tokenBContract: FungibleToken
-  let thirdPartyA: TestPublicKey
-  let thirdPartyAContract: ThirdParty
-  let thirdPartyB: TestPublicKey
-  let thirdPartyBContract: ThirdParty
-
-  before(async () => {
-    ;[deployer, sender, receiver] = localChain.testAccounts
-
-    tokenAdmin = newTestPublicKey()
-    tokenAdminContract = new FungibleTokenAdmin(tokenAdmin)
-    newTokenAdmin = newTestPublicKey()
-    newTokenAdminContract = new FungibleTokenAdmin(newTokenAdmin)
-
-    tokenA = newTestPublicKey()
-    tokenAContract = new FungibleToken(tokenA)
-
-    tokenBAdmin = newTestPublicKey()
-    tokenBAdminContract = new CustomTokenAdmin(tokenBAdmin)
-    tokenB = newTestPublicKey()
-    tokenBContract = new FungibleToken(tokenB)
-
-    thirdPartyA = newTestPublicKey()
-    thirdPartyAContract = new ThirdParty(thirdPartyA)
-
-    thirdPartyB = newTestPublicKey()
-    thirdPartyBContract = new ThirdParty(thirdPartyB)
-
-    if (proofsEnabled) {
-      await FungibleToken.compile()
-      await ThirdParty.compile()
-      await FungibleTokenAdmin.compile()
-      await CustomTokenAdmin.compile()
-    }
-  })
+describe("token integration", async () => {
+  if (proofsEnabled) {
+    await FungibleToken.compile()
+    await ThirdParty.compile()
+    await FungibleTokenAdmin.compile()
+    await CustomTokenAdmin.compile()
+  }
+
+  const [
+    tokenAdmin,
+    newTokenAdmin,
+    tokenA,
+    tokenBAdmin,
+    tokenB,
+    thirdPartyA,
+    thirdPartyB,
+  ] = Mina.TestPublicKey.random(7)
+  const [deployer, sender, receiver] = localChain.testAccounts
+  const tokenAdminContract = new FungibleTokenAdmin(tokenAdmin)
+  const newTokenAdminContract = new FungibleTokenAdmin(newTokenAdmin)
+  const tokenAContract = new FungibleToken(tokenA)
+  const tokenBAdminContract = new CustomTokenAdmin(tokenBAdmin)
+  const tokenBContract = new FungibleToken(tokenB)
+  const thirdPartyAContract = new ThirdParty(thirdPartyA)
+  const thirdPartyBContract = new ThirdParty(thirdPartyB)
 
   describe("deploy", () => {
     it("should deploy token contract A", async () => {

examples/e2e.eg.ts

@@ -1,7 +1,6 @@
 import { equal } from "node:assert"
 import { AccountUpdate, Mina, PrivateKey, UInt64, UInt8 } from "o1js"
 import { FungibleToken, FungibleTokenAdmin } from "../index.js"
-import { TestPublicKeys } from "../test_util.js"
 
 const localChain = await Mina.LocalBlockchain({
   proofsEnabled: false,
@@ -11,7 +10,7 @@ Mina.setActiveInstance(localChain)
 
 const fee = 1e8
 
-const [deployer, owner, alexa, billy] = localChain.testAccounts as TestPublicKeys
+const [deployer, owner, alexa, billy] = Mina.TestPublicKey.random(4)
 const contract = PrivateKey.randomKeypair()
 const admin = PrivateKey.randomKeypair()
 

examples/escrow.eg.ts

@@ -12,7 +12,6 @@ import {
   UInt64,
   UInt8,
 } from "o1js"
-import { TestPublicKeys } from "test_util.js"
 import { FungibleToken, FungibleTokenAdmin } from "../index.js"
 
 export class TokenEscrow extends SmartContract {
@@ -54,7 +53,7 @@ Mina.setActiveInstance(localChain)
 
 const fee = 1e8
 
-const [deployer, owner, alexa, billy, jackie] = localChain.testAccounts as TestPublicKeys
+const [deployer, owner, alexa, billy, jackie] = Mina.TestPublicKey.random(5)
 const tokenContract = PrivateKey.randomKeypair()
 const escrowContract = PrivateKey.randomKeypair()
 const admin = PrivateKey.randomKeypair()

package.json

@@ -9,7 +9,8 @@
   "scripts": {
     "task": "node --enable-source-maps --no-warnings= --loader ts-node/esm",
     "test": "npm run task -- --test FungibleToken.test.ts",
-    "build": "tsc"
+    "build": "tsc",
+    "check": "tsc --noEmit"
   },
   "peerDependencies": {
     "o1js": "^1.1.0"