Browse Source

updated, outdated methods of basic-0,1,2,3 (#2144)

Tests aren't running properly on this so going to merge and then revert if tests fail
Vipin Saini 3 years ago
parent
commit
6a46bedaf1

+ 1 - 1
examples/tutorial/basic-0/tests/basic-0.js

@@ -10,7 +10,7 @@ describe("basic-0", () => {
     const program = anchor.workspace.Basic0;
 
     // Execute the RPC.
-    await program.rpc.initialize();
+    await program.methods.initialize().rpc();
     // #endregion code
   });
 });

+ 10 - 13
examples/tutorial/basic-1/tests/basic-1.js

@@ -19,14 +19,13 @@ describe("basic-1", () => {
 
     // Create the new account and initialize it with the program.
     // #region code-simplified
-    await program.rpc.initialize(new anchor.BN(1234), {
-      accounts: {
-        myAccount: myAccount.publicKey,
-        user: provider.wallet.publicKey,
-        systemProgram: SystemProgram.programId,
-      },
-      signers: [myAccount],
-    });
+    await program.methods.initialize(new anchor.BN(1234)).
+    accounts({
+      myAccount: myAccount.publicKey,
+      user: provider.wallet.publicKey,
+      systemProgram: SystemProgram.programId,
+    }).
+    signers([myAccount]).rpc();
     // #endregion code-simplified
 
     // Fetch the newly created account from the cluster.
@@ -48,11 +47,9 @@ describe("basic-1", () => {
     const program = anchor.workspace.Basic1;
 
     // Invoke the update rpc.
-    await program.rpc.update(new anchor.BN(4321), {
-      accounts: {
-        myAccount: myAccount.publicKey,
-      },
-    });
+    await program.methods.update(new anchor.BN(4321)).accounts({
+      myAccount: myAccount.publicKey,
+    }).rpc();
 
     // Fetch the newly updated account.
     const account = await program.account.myAccount.fetch(myAccount.publicKey);

+ 6 - 9
examples/tutorial/basic-2/tests/basic-2.js

@@ -15,14 +15,12 @@ describe("basic-2", () => {
   const program = anchor.workspace.Basic2;
 
   it("Creates a counter", async () => {
-    await program.rpc.create(provider.wallet.publicKey, {
-      accounts: {
+    await program.methods.create(provider.wallet.publicKey).
+      accounts({
         counter: counter.publicKey,
         user: provider.wallet.publicKey,
         systemProgram: SystemProgram.programId,
-      },
-      signers: [counter],
-    });
+      }).signers([counter]).rpc();
 
     let counterAccount = await program.account.counter.fetch(counter.publicKey);
 
@@ -31,12 +29,11 @@ describe("basic-2", () => {
   });
 
   it("Updates a counter", async () => {
-    await program.rpc.increment({
-      accounts: {
+     await program.methods.increment().
+      accounts({
         counter: counter.publicKey,
         authority: provider.wallet.publicKey,
-      },
-    });
+      }).rpc();
 
     const counterAccount = await program.account.counter.fetch(
       counter.publicKey

+ 7 - 9
examples/tutorial/basic-3/tests/basic-3.js

@@ -14,22 +14,20 @@ describe("basic-3", () => {
 
     // Initialize a new puppet account.
     const newPuppetAccount = anchor.web3.Keypair.generate();
-    const tx = await puppet.rpc.initialize({
-      accounts: {
+    const tx = await puppet.methods.initialize().
+      accounts({
         puppet: newPuppetAccount.publicKey,
         user: provider.wallet.publicKey,
         systemProgram: SystemProgram.programId,
-      },
-      signers: [newPuppetAccount],
-    });
+      }).
+      signers([newPuppetAccount]).rpc();
 
     // Invoke the puppet master to perform a CPI to the puppet.
-    await puppetMaster.rpc.pullStrings(new anchor.BN(111), {
-      accounts: {
+    await puppetMaster.methods.pullStrings(new anchor.BN(111)).
+      accounts({
         puppet: newPuppetAccount.publicKey,
         puppetProgram: puppet.programId,
-      },
-    });
+      }).rpc();
 
     // Check the state updated.
     puppetAccount = await puppet.account.data.fetch(newPuppetAccount.publicKey);