Cleanup (#7176)

* Drop serde error instances

These were no longer needed after ToPrimitive instances were
added.

* Rename last of _api crates

programs/btc_spv/src/header_store.rs

@@ -5,7 +5,7 @@ use solana_sdk::pubkey::Pubkey;
 
 // HeaderStore is a data structure that allows linked list style cheap appends and
 // sequential reads, but also has a "lookup index" to speed up random access
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum HeaderStoreError {
     InvalidHeader,
     GroupExists,

programs/btc_spv/src/spv_state.rs

@@ -399,7 +399,7 @@ impl Default for AccountState {
 }
 
 ///Errors
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum SpvError {
     InvalidBlockHeader,
     // blockheader is malformed or out of order

programs/btc_spv/src/utils.rs

@@ -30,7 +30,7 @@ impl fmt::Display for DecodeHexError {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum LengthError {
     OddLength,
     Maximum(u32),

programs/budget/src/budget_instruction.rs

@@ -11,7 +11,7 @@ use solana_sdk::{
     system_instruction,
 };
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
+#[derive(Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
 pub enum BudgetError {
     DestinationMissing,
 }

programs/librapay/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "solana-librapay-api"
+name = "solana-librapay"
 version = "0.22.0"
 description = "Solana Libra Payment"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
@@ -19,5 +19,5 @@ language_e2e_tests = { version = "0.0.1-sol4", package = "solana_libra_language_
 types = { version = "0.0.1-sol4", package = "solana_libra_types" }
 
 [lib]
-crate-type = ["lib"]
-name = "solana_librapay_api"
+crate-type = ["lib", "cdylib"]
+name = "solana_librapay"

programs/ownable/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "solana-ownable-api"
+name = "solana-ownable"
 version = "0.22.0"
-description = "ownable program API"
+description = "ownable program"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
@@ -20,5 +20,5 @@ num-traits = "0.2"
 solana-runtime = { path = "../../runtime", version = "0.22.0" }
 
 [lib]
-crate-type = ["lib"]
-name = "solana_ownable_api"
+crate-type = ["lib", "cdylib"]
+name = "solana_ownable"

programs/ownable/src/ownable_instruction.rs

@@ -1,5 +1,4 @@
 use num_derive::{FromPrimitive, ToPrimitive};
-use serde_derive::{Deserialize, Serialize};
 use solana_sdk::{
     instruction::{AccountMeta, Instruction},
     instruction_processor_utils::DecodeError,
@@ -7,7 +6,7 @@ use solana_sdk::{
     system_instruction,
 };
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
+#[derive(Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
 pub enum OwnableError {
     IncorrectOwner,
 }

programs/stake/src/stake_instruction.rs

@@ -17,7 +17,7 @@ use solana_sdk::{
 };
 
 /// Reasons the stake might have had an error
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
+#[derive(Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
 pub enum StakeError {
     NoCreditsToRedeem,
     LockupInForce,

programs/storage/src/storage_contract.rs

@@ -38,7 +38,7 @@ impl Credits {
     }
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive)]
+#[derive(Debug, Clone, PartialEq, FromPrimitive)]
 pub enum StorageError {
     InvalidSegment,
     InvalidBlockhash,

programs/vest/src/vest_instruction.rs

@@ -10,7 +10,7 @@ use solana_sdk::{
     system_instruction,
 };
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive)]
+#[derive(Debug, Clone, PartialEq, FromPrimitive)]
 pub enum VestError {
     DestinationMissing,
     Unauthorized,

programs/vote/src/vote_instruction.rs

@@ -19,7 +19,7 @@ use solana_sdk::{
 };
 
 /// Reasons the stake might have had an error
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
+#[derive(Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)]
 pub enum VoteError {
     VoteTooOld,
     SlotsMismatch,