Bladeren bron

tests: fix anchor-lang dependency paths (#1809)

Paul 3 jaren geleden
bovenliggende
commit
9a9dc95305

+ 1 - 1
tests/custom-coder/programs/custom-coder/Cargo.toml

@@ -17,4 +17,4 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-anchor-lang = "0.20.0"
+anchor-lang = { path = "../../../../lang" }

+ 1 - 1
tests/custom-coder/programs/custom-coder/src/lib.rs

@@ -5,7 +5,7 @@ declare_id!("Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS");
 #[program]
 pub mod custom_coder {
     use super::*;
-    pub fn initialize(_ctx: Context<Initialize>, a: Option<u8>) -> ProgramResult {
+    pub fn initialize(_ctx: Context<Initialize>, a: Option<u8>) -> Result<()> {
         Ok(())
     }
 }

+ 1 - 1
tests/custom-coder/programs/spl-token/Cargo.toml

@@ -17,4 +17,4 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-anchor-lang = "0.20.0"
+anchor-lang = { path = "../../../../lang" }

+ 21 - 21
tests/custom-coder/programs/spl-token/src/lib.rs

@@ -16,27 +16,27 @@ pub mod spl_token {
         decimals: u8,
         mint_authority: Pubkey,
         //        freeze_authority: COption<Pubkey>,
-    ) -> ProgramResult {
+    ) -> Result<()> {
         Ok(())
     }
 
-    pub fn initialize_account(ctx: Context<InitializeAccount>) -> ProgramResult {
+    pub fn initialize_account(ctx: Context<InitializeAccount>) -> Result<()> {
         Ok(())
     }
 
-    pub fn initialize_multisig(ctx: Context<InitializeMultisig>, m: u8) -> ProgramResult {
+    pub fn initialize_multisig(ctx: Context<InitializeMultisig>, m: u8) -> Result<()> {
         Ok(())
     }
 
-    pub fn transfer(ctx: Context<Transfer>, amount: u64) -> ProgramResult {
+    pub fn transfer(ctx: Context<Transfer>, amount: u64) -> Result<()> {
         Ok(())
     }
 
-    pub fn approve(ctx: Context<Approve>, amount: u64) -> ProgramResult {
+    pub fn approve(ctx: Context<Approve>, amount: u64) -> Result<()> {
         Ok(())
     }
 
-    pub fn revoke(ctx: Context<Revoke>) -> ProgramResult {
+    pub fn revoke(ctx: Context<Revoke>) -> Result<()> {
         Ok(())
     }
 
@@ -44,27 +44,27 @@ pub mod spl_token {
         ctx: Context<SetAuthority>,
         authority_type: u8,
         //        new_authority: COption<Pubkey>,
-    ) -> ProgramResult {
+    ) -> Result<()> {
         Ok(())
     }
 
-    pub fn mint_to(ctx: Context<MintTo>, amount: u64) -> ProgramResult {
+    pub fn mint_to(ctx: Context<MintTo>, amount: u64) -> Result<()> {
         Ok(())
     }
 
-    pub fn burn(ctx: Context<Burn>, amount: u64) -> ProgramResult {
+    pub fn burn(ctx: Context<Burn>, amount: u64) -> Result<()> {
         Ok(())
     }
 
-    pub fn close_account(ctx: Context<CloseAccount>) -> ProgramResult {
+    pub fn close_account(ctx: Context<CloseAccount>) -> Result<()> {
         Ok(())
     }
 
-    pub fn freeze_account(ctx: Context<FreezeAccount>) -> ProgramResult {
+    pub fn freeze_account(ctx: Context<FreezeAccount>) -> Result<()> {
         Ok(())
     }
 
-    pub fn thaw_account(ctx: Context<ThawAccount>) -> ProgramResult {
+    pub fn thaw_account(ctx: Context<ThawAccount>) -> Result<()> {
         Ok(())
     }
 
@@ -72,7 +72,7 @@ pub mod spl_token {
         ctx: Context<TransferChecked>,
         amount: u64,
         decimals: u8,
-    ) -> ProgramResult {
+    ) -> Result<()> {
         Ok(())
     }
 
@@ -80,7 +80,7 @@ pub mod spl_token {
         ctx: Context<ApproveChecked>,
         amount: u64,
         decimals: u8,
-    ) -> ProgramResult {
+    ) -> Result<()> {
         Ok(())
     }
 
@@ -88,33 +88,33 @@ pub mod spl_token {
         ctx: Context<MintToChecked>,
         amount: u64,
         decimals: u8,
-    ) -> ProgramResult {
+    ) -> Result<()> {
         Ok(())
     }
 
-    pub fn burn_checked(ctx: Context<BurnChecked>, amount: u64, decimals: u8) -> ProgramResult {
+    pub fn burn_checked(ctx: Context<BurnChecked>, amount: u64, decimals: u8) -> Result<()> {
         Ok(())
     }
 
     pub fn initialize_account_2(
         ctx: Context<InitializeAccount2>,
         authority: Pubkey,
-    ) -> ProgramResult {
+    ) -> Result<()> {
         Ok(())
     }
 
-    pub fn sync_native(ctx: Context<SyncNative>) -> ProgramResult {
+    pub fn sync_native(ctx: Context<SyncNative>) -> Result<()> {
         Ok(())
     }
 
     pub fn initialize_account3(
         ctx: Context<InitializeAccount3>,
         authority: Pubkey,
-    ) -> ProgramResult {
+    ) -> Result<()> {
         Ok(())
     }
 
-    pub fn initialize_multisig_2(ctx: Context<InitializeMultisig2>, m: u8) -> ProgramResult {
+    pub fn initialize_multisig_2(ctx: Context<InitializeMultisig2>, m: u8) -> Result<()> {
         Ok(())
     }
 
@@ -123,7 +123,7 @@ pub mod spl_token {
         decimals: u8,
         mint_authority: Pubkey,
         //        freeze_authority: COption<Pubkey>,
-    ) -> ProgramResult {
+    ) -> Result<()> {
         Ok(())
     }
 }

+ 1 - 1
tests/multiple-suites/programs/multiple-suites/Cargo.toml

@@ -16,4 +16,4 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-anchor-lang = "0.24.2"
+anchor-lang = { path = "../../../../lang" }