Remove frozen ABI modules from solana-sdk

runtime/Cargo.toml

@@ -35,12 +35,13 @@ regex = "1.3.9"
 serde = { version = "1.0.112", features = ["rc"] }
 serde_derive = "1.0.103"
 solana-config-program = { path = "../programs/config", version = "1.5.0" }
+solana-frozen-abi = { path = "../frozen-abi", version = "1.5.0" }
+solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "1.5.0" }
 solana-logger = { path = "../logger", version = "1.5.0" }
 solana-measure = { path = "../measure", version = "1.5.0" }
 solana-metrics = { path = "../metrics", version = "1.5.0" }
 solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "1.5.0" }
 solana-sdk = { path = "../sdk", version = "1.5.0" }
-solana-sdk-macro-frozen-abi = { path = "../sdk/macro-frozen-abi", version = "1.5.0" }
 solana-stake-program = { path = "../programs/stake", version = "1.5.0" }
 solana-vote-program = { path = "../programs/vote", version = "1.5.0" }
 solana-secp256k1-program = { path = "../programs/secp256k1", version = "1.5.0" }

runtime/build.rs

@@ -1 +1 @@
-../sdk/build.rs
+../frozen-abi/build.rs

runtime/src/accounts_db.rs

@@ -469,7 +469,7 @@ fn make_min_priority_thread_pool() -> ThreadPool {
 }
 
 #[cfg(all(test, RUSTC_WITH_SPECIALIZATION))]
-impl solana_sdk::abi_example::AbiExample for AccountsDB {
+impl solana_frozen_abi::abi_example::AbiExample for AccountsDB {
     fn example() -> Self {
         let accounts_db = AccountsDB::new_single();
         let key = Pubkey::default();

runtime/src/bank.rs

@@ -330,7 +330,7 @@ pub struct BankRc {
 }
 
 #[cfg(RUSTC_WITH_SPECIALIZATION)]
-use solana_sdk::abi_example::AbiExample;
+use solana_frozen_abi::abi_example::AbiExample;
 #[cfg(RUSTC_WITH_SPECIALIZATION)]
 impl AbiExample for BankRc {
     fn example() -> Self {

runtime/src/lib.rs

@@ -44,7 +44,7 @@ extern crate solana_metrics;
 extern crate serde_derive;
 
 #[macro_use]
-extern crate solana_sdk_macro_frozen_abi;
+extern crate solana_frozen_abi_macro;
 
 extern crate fs_extra;
 extern crate tempfile;

runtime/src/message_processor.rs

@@ -387,7 +387,7 @@ impl Clone for MessageProcessor {
 }
 
 #[cfg(RUSTC_WITH_SPECIALIZATION)]
-impl ::solana_sdk::abi_example::AbiExample for MessageProcessor {
+impl ::solana_frozen_abi::abi_example::AbiExample for MessageProcessor {
     fn example() -> Self {
         // MessageProcessor's fields are #[serde(skip)]-ed and not Serialize
         // so, just rely on Default anyway.

runtime/src/serde_snapshot.rs

@@ -39,7 +39,7 @@ use {
 };
 
 #[cfg(RUSTC_WITH_SPECIALIZATION)]
-use solana_sdk::abi_example::IgnoreAsHelper;
+use solana_frozen_abi::abi_example::IgnoreAsHelper;
 
 mod common;
 mod future;

runtime/src/serde_snapshot/future.rs

@@ -1,6 +1,6 @@
 use super::common::UnusedAccounts;
 #[cfg(all(test, RUSTC_WITH_SPECIALIZATION))]
-use solana_sdk::abi_example::IgnoreAsHelper;
+use solana_frozen_abi::abi_example::IgnoreAsHelper;
 use {super::*, solana_measure::measure::Measure, std::cell::RefCell};
 
 type AccountsDbFields = super::AccountsDbFields<SerializableAccountStorageEntry>;
@@ -13,7 +13,7 @@ pub(super) struct SerializableAccountStorageEntry {
 }
 
 #[cfg(all(test, RUSTC_WITH_SPECIALIZATION))]
-impl solana_sdk::abi_example::IgnoreAsHelper for SerializableAccountStorageEntry {}
+impl solana_frozen_abi::abi_example::IgnoreAsHelper for SerializableAccountStorageEntry {}
 
 impl From<&AccountStorageEntry> for SerializableAccountStorageEntry {
     fn from(rhs: &AccountStorageEntry) -> Self {

runtime/src/serde_snapshot/tests.rs

@@ -262,7 +262,7 @@ mod test_bank_serialize {
 
     // These some what long test harness is required to freeze the ABI of
     // Bank's serialization due to versioned nature
-    #[frozen_abi(digest = "5rd8RyVSLH3hm12xJDVCJWgc1gyqb4Ukt2hJLJNfsB5v")]
+    #[frozen_abi(digest = "ULV2jDndxR3JB677ayyjaamtAcZ24q75tCkHS2bKVoy")]
     #[derive(Serialize, AbiExample)]
     pub struct BankAbiTestWrapperFuture {
         #[serde(serialize_with = "wrapper_future")]

runtime/src/serde_snapshot/utils.rs

@@ -3,7 +3,7 @@ use serde::{
     Serialize, Serializer,
 };
 #[cfg(all(test, RUSTC_WITH_SPECIALIZATION))]
-use solana_sdk::abi_example::IgnoreAsHelper;
+use solana_frozen_abi::abi_example::IgnoreAsHelper;
 
 // consumes an iterator and returns an object that will serialize as a serde seq
 #[allow(dead_code)]