Move runtime.rs into its own crate

This commit is contained in:
Greg Fitzgerald 2019-02-07 09:44:42 -07:00 committed by Grimes
parent 731e5e1291
commit 5128d7d6c3
7 changed files with 33 additions and 3 deletions

10
Cargo.lock generated
View File

@ -1968,6 +1968,7 @@ dependencies = [
"solana-metrics 0.12.0", "solana-metrics 0.12.0",
"solana-native-loader 0.12.0", "solana-native-loader 0.12.0",
"solana-netutil 0.12.0", "solana-netutil 0.12.0",
"solana-runtime 0.12.0",
"solana-sdk 0.12.0", "solana-sdk 0.12.0",
"solana-system-program 0.12.0", "solana-system-program 0.12.0",
"solana-vote-signer 0.12.0", "solana-vote-signer 0.12.0",
@ -2200,6 +2201,15 @@ dependencies = [
"solana-sdk 0.12.0", "solana-sdk 0.12.0",
] ]
[[package]]
name = "solana-runtime"
version = "0.12.0"
dependencies = [
"solana-native-loader 0.12.0",
"solana-sdk 0.12.0",
"solana-system-program 0.12.0",
]
[[package]] [[package]]
name = "solana-sdk" name = "solana-sdk"
version = "0.12.0" version = "0.12.0"

View File

@ -55,6 +55,7 @@ solana-logger = { path = "logger", version = "0.12.0" }
solana-metrics = { path = "metrics", version = "0.12.0" } solana-metrics = { path = "metrics", version = "0.12.0" }
solana-native-loader = { path = "programs/native/native_loader", version = "0.12.0" } solana-native-loader = { path = "programs/native/native_loader", version = "0.12.0" }
solana-netutil = { path = "netutil", version = "0.12.0" } solana-netutil = { path = "netutil", version = "0.12.0" }
solana-runtime = { path = "runtime", version = "0.12.0" }
solana-sdk = { path = "sdk", version = "0.12.0" } solana-sdk = { path = "sdk", version = "0.12.0" }
solana-system-program = { path = "programs/native/system", version = "0.12.0" } solana-system-program = { path = "programs/native/system", version = "0.12.0" }
solana-vote-signer = { path = "vote-signer", version = "0.12.0" } solana-vote-signer = { path = "vote-signer", version = "0.12.0" }

View File

@ -24,6 +24,7 @@ CRATES=(
genesis genesis
ledger-tool ledger-tool
wallet wallet
runtime
) )

19
runtime/Cargo.toml Normal file
View File

@ -0,0 +1,19 @@
[package]
name = "solana-runtime"
version = "0.12.0"
description = "Solana runtime"
authors = ["Solana Maintainers <maintainers@solana.com>"]
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-sdk = { path = "../sdk", version = "0.12.0" }
solana-native-loader = { path = "../programs/native/native_loader", version = "0.12.0" }
solana-system-program = { path = "../programs/native/system", version = "0.12.0" }
[lib]
name = "solana_runtime"
crate-type = ["lib"]

View File

@ -12,12 +12,12 @@ use crate::last_id_queue::{LastIdQueue, MAX_ENTRY_IDS};
use crate::leader_scheduler::{LeaderScheduler, LeaderSchedulerConfig}; use crate::leader_scheduler::{LeaderScheduler, LeaderSchedulerConfig};
use crate::poh_recorder::{PohRecorder, PohRecorderError}; use crate::poh_recorder::{PohRecorder, PohRecorderError};
use crate::result::Error; use crate::result::Error;
use crate::runtime::{self, RuntimeError};
use crate::status_cache::StatusCache; use crate::status_cache::StatusCache;
use bincode::deserialize; use bincode::deserialize;
use itertools::Itertools; use itertools::Itertools;
use log::Level; use log::Level;
use rayon::prelude::*; use rayon::prelude::*;
use solana_runtime::{self, RuntimeError};
use solana_sdk::account::Account; use solana_sdk::account::Account;
use solana_sdk::bpf_loader; use solana_sdk::bpf_loader;
use solana_sdk::budget_program; use solana_sdk::budget_program;
@ -578,7 +578,7 @@ impl Bank {
.map(|(accs, tx)| match accs { .map(|(accs, tx)| match accs {
Err(e) => Err(e.clone()), Err(e) => Err(e.clone()),
Ok((ref mut accounts, ref mut loaders)) => { Ok((ref mut accounts, ref mut loaders)) => {
runtime::execute_transaction(tx, loaders, accounts, tick_height).map_err( solana_runtime::execute_transaction(tx, loaders, accounts, tick_height).map_err(
|RuntimeError::ProgramError(index, err)| { |RuntimeError::ProgramError(index, err)| {
BankError::ProgramError(index, err) BankError::ProgramError(index, err)
}, },

View File

@ -58,7 +58,6 @@ pub mod rpc;
pub mod rpc_mock; pub mod rpc_mock;
pub mod rpc_pubsub; pub mod rpc_pubsub;
pub mod rpc_request; pub mod rpc_request;
pub mod runtime;
pub mod service; pub mod service;
pub mod sigverify; pub mod sigverify;
pub mod sigverify_stage; pub mod sigverify_stage;