Browse Source

Update to solana v1.4.4

Michael Vines 5 years ago
parent
commit
f1ae2261f1
2 changed files with 8 additions and 10 deletions
  1. 4 4
      program/Cargo.toml
  2. 4 6
      program/src/processor.rs

+ 4 - 4
program/Cargo.toml

@@ -12,15 +12,15 @@ exclude = ["js/**"]
 exclude_entrypoint = []
 
 [dependencies]
+arrayref = "0.3.6"
 num-derive = "0.3"
 num-traits = "0.2"
-remove_dir_all = "=0.5.0"
-solana-program = "1.4.3"
-thiserror = "1.0"
-arrayref = "0.3.6"
 num_enum = "0.5.1"
+solana-program = "1.4.4"
+thiserror = "1.0"
 
 [dev-dependencies]
+solana-sdk = "1.4.4"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 4 - 6
program/src/processor.rs

@@ -1,7 +1,5 @@
 //! Program state processor
 
-//#![cfg(feature = "program")]
-
 use crate::{
     error::TokenError,
     instruction::{is_valid_signer_index, AuthorityType, TokenInstruction, MAX_SIGNERS},
@@ -784,9 +782,9 @@ impl PrintProgramError for TokenError {
 mod tests {
     use super::*;
     use crate::instruction::*;
-    use solana_program::{
-        account::Account as SolanaAccount, account_info::create_is_signer_account_infos,
-        clock::Epoch, instruction::Instruction, sysvar::rent,
+    use solana_program::{clock::Epoch, instruction::Instruction, sysvar::rent};
+    use solana_sdk::account::{
+        create_account, create_is_signer_account_infos, Account as SolanaAccount,
     };
 
     fn do_process_instruction(
@@ -816,7 +814,7 @@ mod tests {
     }
 
     fn rent_sysvar() -> SolanaAccount {
-        rent::create_account(42, &Rent::default())
+        create_account(&Rent::default(), 42)
     }
 
     fn mint_minimum_balance() -> u64 {