diff --git a/Cargo.lock b/Cargo.lock index b650cc3c0e..4ac1b01039 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3811,6 +3811,7 @@ dependencies = [ name = "solana-runtime" version = "0.22.0" dependencies = [ + "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "bv 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3916,19 +3917,6 @@ dependencies = [ "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "solana-stake-tests" -version = "0.22.0" -dependencies = [ - "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "solana-logger 0.22.0", - "solana-runtime 0.22.0", - "solana-sdk 0.22.0", - "solana-stake-program 0.22.0", - "solana-vote-program 0.22.0", -] - [[package]] name = "solana-storage-program" version = "0.22.0" diff --git a/Cargo.toml b/Cargo.toml index 16b4eae228..ece2e1bd61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,6 @@ members = [ "programs/noop", "programs/ownable", "programs/stake", - "programs/stake_tests", "programs/storage", "programs/storage_tests", "programs/vest", diff --git a/programs/stake_tests/Cargo.toml b/programs/stake_tests/Cargo.toml deleted file mode 100644 index 988fcf288a..0000000000 --- a/programs/stake_tests/Cargo.toml +++ /dev/null @@ -1,20 +0,0 @@ -[package] -name = "solana-stake-tests" -version = "0.22.0" -description = "Solana stake tests" -authors = ["Solana Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solana.com/" -edition = "2018" - -[dependencies] -log = "0.4.8" -solana-logger = { path = "../../logger", version = "0.22.0" } -solana-sdk = { path = "../../sdk", version = "0.22.0" } -solana-stake-program = { path = "../stake", version = "0.22.0" } -solana-vote-program = { path = "../vote", version = "0.22.0" } - -[dev-dependencies] -solana-runtime = { path = "../../runtime", version = "0.22.0" } -assert_matches = "1.3.0" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 4408f36049..882e73fdf1 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -42,4 +42,5 @@ crate-type = ["lib"] name = "solana_runtime" [dev-dependencies] +assert_matches = "1.3.0" solana-noop-program = { path = "../programs/noop", version = "0.22.0" } diff --git a/programs/stake_tests/tests/stake_instruction.rs b/runtime/tests/stake.rs similarity index 100% rename from programs/stake_tests/tests/stake_instruction.rs rename to runtime/tests/stake.rs