Remove old logging enabler artifacts (bp #9777) (#9818)

automerge
This commit is contained in:
mergify[bot]
2020-04-30 01:52:01 -07:00
committed by GitHub
parent b7bd9d9fbb
commit 8fef8eaed9
8 changed files with 28 additions and 11 deletions

1
Cargo.lock generated
View File

@ -4176,7 +4176,6 @@ dependencies = [
"num-traits 0.2.11",
"serde",
"serde_derive",
"solana-logger",
"solana-metrics",
"solana-sdk",
"thiserror",

View File

@ -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",

View File

@ -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"

View File

@ -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)",
]

View File

@ -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"

View File

@ -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);

View File

@ -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"

View File

@ -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);