diff --git a/Cargo.lock b/Cargo.lock index bbc1c9dd8c..007de69dba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4176,7 +4176,6 @@ dependencies = [ "num-traits 0.2.11", "serde", "serde_derive", - "solana-logger", "solana-metrics", "solana-sdk", "thiserror", diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index f98e539dad..6297a0b32d 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -1881,7 +1881,6 @@ dependencies = [ "log", "serde", "serde_derive", - "solana-logger", "solana-sdk", ] @@ -2041,7 +2040,6 @@ dependencies = [ "serde", "serde_derive", "solana-config-program", - "solana-logger", "solana-metrics", "solana-sdk", "solana-vote-program", @@ -2073,7 +2071,6 @@ dependencies = [ "num-traits 0.2.11", "serde", "serde_derive", - "solana-logger", "solana-metrics", "solana-sdk", "thiserror", diff --git a/programs/config/Cargo.toml b/programs/config/Cargo.toml index 31a9ad8652..6c1aa67212 100644 --- a/programs/config/Cargo.toml +++ b/programs/config/Cargo.toml @@ -14,9 +14,11 @@ chrono = { version = "0.4.11", features = ["serde"] } log = "0.4.8" serde = "1.0.105" serde_derive = "1.0.103" -solana-logger = { path = "../../logger", version = "1.1.8" } solana-sdk = { path = "../../sdk", version = "1.1.8" } +[dev-dependencies] +solana-logger = { path = "../../logger", version = "1.1.8" } + [lib] crate-type = ["lib", "cdylib"] name = "solana_config_program" diff --git a/programs/librapay/Cargo.lock b/programs/librapay/Cargo.lock index a071f1aec1..e4367d0c12 100644 --- a/programs/librapay/Cargo.lock +++ b/programs/librapay/Cargo.lock @@ -2537,10 +2537,16 @@ dependencies = [ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "solana-logger 1.1.0", "solana-sdk 1.1.0", +======= + "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk 1.2.0", +>>>>>>> a4fe11fad... Remove old logging enabler artifacts (#9777) ] [[package]] @@ -2732,6 +2738,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "solana-config-program 1.1.0", @@ -2739,6 +2746,14 @@ dependencies = [ "solana-metrics 1.1.0", "solana-sdk 1.1.0", "solana-vote-program 1.1.0", +======= + "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-config-program 1.2.0", + "solana-metrics 1.2.0", + "solana-sdk 1.2.0", + "solana-vote-program 1.2.0", +>>>>>>> a4fe11fad... Remove old logging enabler artifacts (#9777) "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2765,11 +2780,18 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "solana-logger 1.1.0", "solana-metrics 1.1.0", "solana-sdk 1.1.0", +======= + "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-metrics 1.2.0", + "solana-sdk 1.2.0", +>>>>>>> a4fe11fad... Remove old logging enabler artifacts (#9777) "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/programs/stake/Cargo.toml b/programs/stake/Cargo.toml index 6b2919c9a9..85f9ddb237 100644 --- a/programs/stake/Cargo.toml +++ b/programs/stake/Cargo.toml @@ -15,13 +15,15 @@ num-derive = "0.3" num-traits = "0.2" serde = "1.0.105" serde_derive = "1.0.103" -solana-logger = { path = "../../logger", version = "1.1.8" } solana-metrics = { path = "../../metrics", version = "1.1.8" } solana-sdk = { path = "../../sdk", version = "1.1.8" } solana-vote-program = { path = "../vote", version = "1.1.8" } solana-config-program = { path = "../config", version = "1.1.8" } thiserror = "1.0" +[dev-dependencies] +solana-logger = { path = "../../logger", version = "1.1.8" } + [lib] crate-type = ["lib", "cdylib"] name = "solana_stake_program" diff --git a/programs/stake/src/stake_instruction.rs b/programs/stake/src/stake_instruction.rs index 69127b30c7..9c2be317be 100644 --- a/programs/stake/src/stake_instruction.rs +++ b/programs/stake/src/stake_instruction.rs @@ -368,8 +368,6 @@ pub fn process_instruction( keyed_accounts: &[KeyedAccount], data: &[u8], ) -> Result<(), InstructionError> { - solana_logger::setup(); - trace!("process_instruction: {:?}", data); trace!("keyed_accounts: {:?}", keyed_accounts); diff --git a/programs/vote/Cargo.toml b/programs/vote/Cargo.toml index d15fc46c27..3748b3be50 100644 --- a/programs/vote/Cargo.toml +++ b/programs/vote/Cargo.toml @@ -15,7 +15,6 @@ num-derive = "0.3" num-traits = "0.2" serde = "1.0.105" serde_derive = "1.0.103" -solana-logger = { path = "../../logger", version = "1.1.8" } solana-metrics = { path = "../../metrics", version = "1.1.8" } solana-sdk = { path = "../../sdk", version = "1.1.8" } thiserror = "1.0" diff --git a/programs/vote/src/vote_instruction.rs b/programs/vote/src/vote_instruction.rs index f4ef744e61..2bfcbf4759 100644 --- a/programs/vote/src/vote_instruction.rs +++ b/programs/vote/src/vote_instruction.rs @@ -215,8 +215,6 @@ pub fn process_instruction( keyed_accounts: &[KeyedAccount], data: &[u8], ) -> Result<(), InstructionError> { - solana_logger::setup_with_default("solana=info"); - trace!("process_instruction: {:?}", data); trace!("keyed_accounts: {:?}", keyed_accounts);