瀏覽代碼

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

This reverts commit 6a46bedaf1892acfef0e5952ae96134e20e91b35.
Henry-E 3 年之前
父節點
當前提交
46f0b67bff

+ 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.methods.initialize().rpc();
+    await program.rpc.initialize();
     // #endregion code
   });
 });

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

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

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

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

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

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