Update tests.ts

Author: ASCorreia

clients/js/src/tests.ts

@@ -1,74 +1,55 @@
-import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
-import { createV2, createCollection, fetchAssetV1, mplCore, addCollectionPlugin, updateV2, updateAuthority, addPlugin } from "@metaplex-foundation/mpl-core";
-import { createSignerFromKeypair, generateSigner, signerIdentity, sol } from "@metaplex-foundation/umi";
-//import { Keypair, PublicKey } from "@solana/web3.js";
+import { createUmi } from '@metaplex-foundation/umi-bundle-tests';
+import { createV2, createCollection, fetchAssetV1, addCollectionPlugin, updateV2, updateAuthority, addPlugin } from "@metaplex-foundation/mpl-core";
+import { generateSigner } from "@metaplex-foundation/umi";
 
-import wallet from "../../../wallet.json"
 
-const umi = createUmi("http://127.0.0.1:8899").use(mplCore());
-
-let keypair = umi.eddsa.createKeypairFromSecretKey(new Uint8Array(wallet));
-const signer = createSignerFromKeypair(umi, keypair);
-umi.use(signerIdentity(signer));
 // Works
 const test1 = async () => {
-    //const umi = await createUmi();
-    const assetOwner = umi.identity;
-    //const collectionUmi = await createUmi();
-
-    const assetSigner = generateSigner(umi);
-    await umi.rpc.airdrop(keypair.publicKey, sol(10));
-    //await umi.rpc.airdrop(assetSigner.publicKey, sol(10));
-    const assetAddress = assetSigner.publicKey;
-    await createV2(umi, {
-      asset: assetSigner,
-      name: 'My Asset',
-      uri: 'https://example.com/my-asset.json',
-    }).sendAndConfirm(umi);
-  
-    const collectionSigner = generateSigner(umi);
-    const collectionAddress = collectionSigner.publicKey;
-    //expect(false).toBeTruthy()
-    await createCollection(umi, {
-      collection: collectionSigner,
-      name: 'My Collection',
-      uri: 'https://example.com/my-collection.json',
-    }).sendAndConfirm(umi);
-  
-    await addCollectionPlugin(umi, {
-      collection: collectionAddress,
-      plugin: {
-        type: 'UpdateDelegate',
-        authority: { type: 'Address', address: assetOwner.publicKey },
-        additionalDelegates: [],
-      },
-    }).sendAndConfirm(umi);
-  
-    await updateV2(umi, {
-      asset: assetAddress,
-      newCollection: collectionAddress,
-      newUpdateAuthority: updateAuthority('Collection', [collectionAddress]),
-    }).sendAndConfirm(umi);
+  const umi = await createUmi();
+  const assetOwner = umi.identity;
+  const collectionUmi = await createUmi();
+
+  const assetSigner = generateSigner(umi);
+  const assetAddress = assetSigner.publicKey;
+  await createV2(umi, {
+    asset: assetSigner,
+    name: 'My Asset',
+    uri: 'https://example.com/my-asset.json',
+  }).sendAndConfirm(umi);
+
+  const collectionSigner = generateSigner(collectionUmi);
+  const collectionAddress = collectionSigner.publicKey;
+  await createCollection(collectionUmi, {
+    collection: collectionSigner,
+    name: 'My Collection',
+    uri: 'https://example.com/my-collection.json',
+  }).sendAndConfirm(collectionUmi);
+
+  await addCollectionPlugin(collectionUmi, {
+    collection: collectionAddress,
+    plugin: {
+      type: 'UpdateDelegate',
+      authority: { type: 'Address', address: assetOwner.publicKey },
+      additionalDelegates: [],
+    },
+  }).sendAndConfirm(collectionUmi);
+
+  await updateV2(umi, {
+    asset: assetAddress,
+    newCollection: collectionAddress,
+    newUpdateAuthority: updateAuthority('Collection', [collectionAddress]),
+  }).sendAndConfirm(umi);
 
-    const asset = await fetchAssetV1(umi, assetAddress);
-    console.log("\n\n\nTest 1 -> Asset Owner matches? ", asset.owner === assetOwner.publicKey);
+  const asset = await fetchAssetV1(umi, assetAddress);
+  console.log("\n\n\nTest 1 -> Asset Owner matches? ", asset.owner === assetOwner.publicKey);
 
-    console.log("Test 1 -> Update Authority matches? ", asset.updateAuthority.type === 'Collection' && asset.updateAuthority.address === collectionAddress);
+  console.log("Test 1 -> Update Authority matches? ", asset.updateAuthority.type === 'Collection' && asset.updateAuthority.address === collectionAddress);
 };
 
 const test2 = async() => {
-  const umi = createUmi("http://127.0.0.1:8899").use(mplCore());
-  let keypair = umi.eddsa.createKeypairFromSecretKey(new Uint8Array(wallet));
-  const signer = createSignerFromKeypair(umi, keypair);
-  umi.use(signerIdentity(signer));
-
+  const umi = await createUmi();
   const assetOwner = umi.identity;
-
-  const collectionUmi = createUmi("http://127.0.0.1:8899").use(mplCore());
-  let collectionUmiKeypair = umi.eddsa.generateKeypair();
-  await umi.rpc.airdrop(collectionUmiKeypair.publicKey, sol(10));
-  const collectionUmiSigner = createSignerFromKeypair(umi, collectionUmiKeypair);
-  collectionUmi.use(signerIdentity(collectionUmiSigner));
+  const collectionUmi = await createUmi();
 
   const assetSigner = generateSigner(umi);
   const assetAddress = assetSigner.publicKey;
@@ -99,7 +80,6 @@ const test2 = async() => {
 
   await updateV2(umi, {
     asset: assetAddress,
-    authority: assetOwner,
     newCollection: collectionAddress,
     newUpdateAuthority: updateAuthority('Collection', [collectionAddress]),
   }).sendAndConfirm(umi);
@@ -114,18 +94,9 @@ const test2 = async() => {
 }
 
 const test3 = async() => {
-  const umi = createUmi("http://127.0.0.1:8899").use(mplCore());
-  let keypair = umi.eddsa.createKeypairFromSecretKey(new Uint8Array(wallet));
-  const signer = createSignerFromKeypair(umi, keypair);
-  umi.use(signerIdentity(signer));
-
+  const umi = await createUmi();
   const assetOwner = umi.identity;
-
-  const collectionUmi = createUmi("http://127.0.0.1:8899").use(mplCore());
-  let collectionUmiKeypair = umi.eddsa.generateKeypair();
-  await umi.rpc.airdrop(collectionUmiKeypair.publicKey, sol(10));
-  const collectionUmiSigner = createSignerFromKeypair(umi, collectionUmiKeypair);
-  collectionUmi.use(signerIdentity(collectionUmiSigner));
+  const collectionUmi = await createUmi();
   const collectionOwner = collectionUmi.identity;
 
   const assetSigner = generateSigner(umi);
@@ -179,4 +150,3 @@ test2().then(() => {
 test3().then(() => {
     console.log("\nTest 3 completed!")
 })
-