Use spl-memo v3.0.1 (#16384)

* Use memo v3.0.1, which simplifies id imports * tree
solana-labs · Apr 6, 2021 · ae7bc82 · ae7bc82
1 parent 9360e57
commit ae7bc82
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml
@@ -24,8 +24,7 @@ solana-runtime = { path = "../runtime", version = "=1.7.0" }
 solana-stake-program = { path = "../programs/stake", version = "=1.7.0" }
 solana-vote-program = { path = "../programs/vote", version = "=1.7.0" }
 spl-associated-token-account-v1-0 = { package = "spl-associated-token-account", version = "=1.0.2", features = ["no-entrypoint"] }
-spl-memo-v1-0 = { package = "spl-memo", version = "=2.0.1", features = ["no-entrypoint"] }
-spl-memo-v3-0 = { package = "spl-memo", version = "=3.0.1", features = ["no-entrypoint"] }
+spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
 spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
 thiserror = "1.0"
 

diff --git a/transaction-status/src/parse_instruction.rs b/transaction-status/src/parse_instruction.rs
@@ -21,9 +21,8 @@ lazy_static! {
     static ref BPF_LOADER_PROGRAM_ID: Pubkey = solana_sdk::bpf_loader::id();
     static ref BPF_UPGRADEABLE_LOADER_PROGRAM_ID: Pubkey = solana_sdk::bpf_loader_upgradeable::id();
     static ref MEMO_V1_PROGRAM_ID: Pubkey =
-        Pubkey::from_str(&spl_memo_v1_0::id().to_string()).unwrap();
-    static ref MEMO_V3_PROGRAM_ID: Pubkey =
-        Pubkey::from_str(&spl_memo_v3_0::id().to_string()).unwrap();
+        Pubkey::from_str(&spl_memo::v1::id().to_string()).unwrap();
+    static ref MEMO_V3_PROGRAM_ID: Pubkey = Pubkey::from_str(&spl_memo::id().to_string()).unwrap();
     static ref STAKE_PROGRAM_ID: Pubkey = solana_stake_program::id();
     static ref SYSTEM_PROGRAM_ID: Pubkey = system_program::id();
     static ref TOKEN_PROGRAM_ID: Pubkey = spl_token_id_v2_0();