remove arbitrary

nitro-svm · Sep 23, 2024 · dcc6b1e · dcc6b1e
1 parent b8a1670
commit dcc6b1e
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -280,7 +280,6 @@ pretty-hex = "0.3.0"
 prio-graph = "0.2.1"
 proc-macro2 = "1.0.85"
 proptest = "1.4"
-proptest-derive = "0.4.0"
 prost = "0.11.9"
 prost-build = "0.11.9"
 prost-types = "0.11.9"

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -43,14 +43,8 @@ frozen-abi = [
   "dep:solana-frozen-abi-macro",
   "solana-program/frozen-abi",
 ]
-arbitrary = [
-    "dep:arbitrary",
-    "dep:proptest",
-    "dep:proptest-derive",
-]
 
 [dependencies]
-arbitrary = { version = "1.3.1", features = ["derive"], optional = true}
 bincode = { workspace = true }
 bitflags = { workspace = true, features = ["serde"] }
 borsh = { workspace = true, optional = true }
@@ -73,8 +67,6 @@ log = { workspace = true }
 memmap2 = { workspace = true, optional = true }
 num_enum = { workspace = true }
 pbkdf2 = { workspace = true }
-proptest = { workspace = true, optional = true}
-proptest-derive = { workspace = true, optional = true}
 qstring = { workspace = true }
 qualifier_attr = { workspace = true, optional = true }
 rand = { workspace = true, optional = true }

diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
@@ -12,7 +12,6 @@ edition = { workspace = true }
 rust-version = "1.75.0" # solana platform-tools rust version
 
 [dependencies]
-arbitrary = { version = "1.3.1", features = ["derive"], optional = true}
 bincode = { workspace = true }
 blake3 = { workspace = true, features = ["digest", "traits-preview"] }
 borsh = { workspace = true, optional = true }
@@ -26,8 +25,6 @@ log = { workspace = true }
 memoffset = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true, features = ["i128"] }
-proptest = { workspace = true, optional = true}
-proptest-derive = { workspace = true, optional = true}
 qualifier_attr = { workspace = true, optional = true }
 rustversion = { workspace = true }
 serde = { workspace = true }
@@ -98,4 +95,3 @@ default = ["borsh"]
 borsh = ["dep:borsh", "dep:borsh0-10"]
 dev-context-only-utils = ["dep:qualifier_attr"]
 frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
-arbitrary = ["dep:arbitrary", "dep:proptest", "dep:proptest-derive"]
diff --git a/sdk/program/src/hash.rs b/sdk/program/src/hash.rs
@@ -52,10 +52,6 @@ const MAX_BASE58_LEN: usize = 44;
     Zeroable,
 )]
 #[repr(transparent)]
-#[cfg_attr(
-    any(test, feature = "arbitrary"),
-    derive(arbitrary::Arbitrary, proptest_derive::Arbitrary)
-)]
 pub struct Hash(pub(crate) [u8; HASH_BYTES]);
 
 #[derive(Clone, Default)]

diff --git a/sdk/program/src/instruction.rs b/sdk/program/src/instruction.rs
@@ -637,10 +637,6 @@ impl AccountMeta {
 /// [`Message`]: crate::message::Message
 #[cfg_attr(feature = "frozen-abi", derive(AbiExample))]
 #[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
-#[cfg_attr(
-    any(test, feature = "arbitrary"),
-    derive(arbitrary::Arbitrary, proptest_derive::Arbitrary)
-)]
 #[serde(rename_all = "camelCase")]
 #[borsh(crate = "borsh")]
 pub struct CompiledInstruction {

diff --git a/sdk/program/src/message/legacy.rs b/sdk/program/src/message/legacy.rs
@@ -126,10 +126,6 @@ fn compile_instructions(ixs: &[Instruction], keys: &[Pubkey]) -> Vec<CompiledIns
     frozen_abi(digest = "2KnLEqfLcTBQqitE22Pp8JYkaqVVbAkGbCfdeHoyxcAU"),
     derive(AbiExample)
 )]
-#[cfg_attr(
-    feature = "arbitrary",
-    derive(arbitrary::Arbitrary, proptest_derive::Arbitrary)
-)]
 #[derive(BorshDeserialize, BorshSerialize, Serialize, Deserialize, Default, Debug, PartialEq, Eq, Clone)]
 #[serde(rename_all = "camelCase")]
 #[borsh(crate = "borsh")]

diff --git a/sdk/program/src/message/mod.rs b/sdk/program/src/message/mod.rs
@@ -92,10 +92,6 @@ pub const MESSAGE_HEADER_LENGTH: usize = 3;
 ///
 /// [PoH]: https://docs.solanalabs.com/consensus/synchronization
 #[cfg_attr(feature = "frozen-abi", derive(AbiExample))]
-#[cfg_attr(
-    feature = "arbitrary",
-    derive(arbitrary::Arbitrary, proptest_derive::Arbitrary)
-)]
 #[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Default, Debug, PartialEq, Eq, Clone, Copy)]
 #[serde(rename_all = "camelCase")]
 #[borsh(crate = "borsh")]

diff --git a/sdk/program/src/pubkey.rs b/sdk/program/src/pubkey.rs
@@ -93,10 +93,6 @@ impl From<u64> for PubkeyError {
     Zeroable,
 )]
 #[cfg_attr(test, derive(Arbitrary))]
-#[cfg_attr(
-    feature = "arbitrary",
-    derive(arbitrary::Arbitrary, proptest_derive::Arbitrary)
-)]
 pub struct Pubkey(pub(crate) [u8; 32]);
 
 impl crate::sanitize::Sanitize for Pubkey {}

diff --git a/sdk/src/transaction/mod.rs b/sdk/src/transaction/mod.rs
@@ -174,10 +174,6 @@ pub type Result<T> = result::Result<T, TransactionError>;
     derive(AbiExample),
     frozen_abi(digest = "FZtncnS1Xk8ghHfKiXE5oGiUbw2wJhmfXQuNgQR3K6Mc")
 )]
-#[cfg_attr(
-    feature = "arbitrary",
-    derive(arbitrary::Arbitrary, proptest_derive::Arbitrary)
-)]
 #[derive(BorshDeserialize, BorshSerialize, Debug, PartialEq, Default, Eq, Clone, Serialize, Deserialize)]
 pub struct Transaction {
     /// A set of signatures of a serialized [`Message`], signed by the first