Upgrade to Anchor 0.15.0 (#7)

Author: macalinao

Cargo.lock

@@ -10,8 +10,8 @@ edition = "2018"
 exclude = ["images/"]
 
 [dependencies]
-anchor-lang = "0.13.2"
-anchor-spl = "0.13.2"
+anchor-lang = "0.15.0"
+anchor-spl = "0.15.0"
 spl-associated-token-account = { version = "1.0.3", features = [
     "no-entrypoint"
 ] }

Cargo.toml

@@ -229,24 +229,23 @@ mod tests {
 
     #[test]
     fn test_assert_owner() -> ProgramResult {
-        let key = Pubkey::new_unique();
         let mut lamports: u64 = 8 + (TestData::default().try_to_vec().unwrap().len() as u64);
 
         let mut buffer: [u8; 16] = [0; 16];
         let mut buf: &mut [u8] = &mut buffer;
         TestData::default().try_serialize(&mut buf)?;
 
-        let info: CpiAccount<TestData> = CpiAccount::try_from(&AccountInfo::new(
-            &key,
+        let info: Account<TestData> = Account::try_from(&AccountInfo::new(
+            &crate::ID,
             false,
             false,
             &mut lamports,
             &mut buffer,
-            &key,
+            &crate::ID,
             false,
             0,
         ))?;
-        assert_owner!(info, key);
+        assert_owner!(info, crate::ID);
 
         Ok(())
     }

src/assert.rs

@@ -9,6 +9,8 @@ pub mod validate;
 
 use anchor_lang::prelude::*;
 
+declare_id!("VipersTest111111111111111111111111111111111");
+
 /// Validates a derived program address.
 pub fn validate_derived_address(
     derived_address: &Pubkey,

src/lib.rs

@@ -1,37 +1,9 @@
 //! Validations for accounts.
 
 use anchor_lang::prelude::*;
-use anchor_spl::token::{Mint, TokenAccount};
-
-use crate::assert_owner;
 
 /// Validates the contents of a variable. Generally used for [Accounts] structs and struct members.
 pub trait Validate<'info> {
     /// Validates the account struct.
     fn validate(&self) -> ProgramResult;
 }
-
-/// Represents an account owned by a program.
-pub trait ProgramOwned: AccountDeserialize + Clone {
-    /// Gets the expected owner of the program owned account.
-    fn expected_owner(&self) -> &'static Pubkey;
-}
-
-impl<'info, T: ProgramOwned> Validate<'info> for CpiAccount<'info, T> {
-    fn validate(&self) -> ProgramResult {
-        assert_owner!(*self, *self.expected_owner());
-        Ok(())
-    }
-}
-
-impl ProgramOwned for TokenAccount {
-    fn expected_owner(&self) -> &'static Pubkey {
-        &crate::program_ids::token::ID
-    }
-}
-
-impl ProgramOwned for Mint {
-    fn expected_owner(&self) -> &'static Pubkey {
-        &crate::program_ids::token::ID
-    }
-}