rebase to 1.7.15

solana-labs · Oct 4, 2021 · 4474776 · 4474776
1 parent e0b9b8b
commit 4474776
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs
@@ -3224,7 +3224,9 @@ mod tests {
                 &packet_indexes,
                 false,
                 votes_only,
-                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(CostModel::default()))))),
+                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(
+                    CostModel::default(),
+                ))))),
                 &BankingStageStats::default(),
                 false,
                 false,
@@ -3239,7 +3241,9 @@ mod tests {
                 &packet_indexes,
                 false,
                 votes_only,
-                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(CostModel::default()))))),
+                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(
+                    CostModel::default(),
+                ))))),
                 &BankingStageStats::default(),
                 false,
                 false,
@@ -3263,7 +3267,9 @@ mod tests {
                 &packet_indexes,
                 false,
                 votes_only,
-                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(CostModel::default()))))),
+                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(
+                    CostModel::default(),
+                ))))),
                 &BankingStageStats::default(),
                 false,
                 false,
@@ -3278,7 +3284,9 @@ mod tests {
                 &packet_indexes,
                 false,
                 votes_only,
-                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(CostModel::default()))))),
+                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(
+                    CostModel::default(),
+                ))))),
                 &BankingStageStats::default(),
                 false,
                 false,
@@ -3302,7 +3310,9 @@ mod tests {
                 &packet_indexes,
                 false,
                 votes_only,
-                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(CostModel::default()))))),
+                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(
+                    CostModel::default(),
+                ))))),
                 &BankingStageStats::default(),
                 false,
                 false,
@@ -3317,7 +3327,9 @@ mod tests {
                 &packet_indexes,
                 false,
                 votes_only,
-                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(CostModel::default()))))),
+                &Arc::new(RwLock::new(CostTracker::new(Arc::new(RwLock::new(
+                    CostModel::default(),
+                ))))),
                 &BankingStageStats::default(),
                 false,
                 false,

diff --git a/core/src/sigverify_stage.rs b/core/src/sigverify_stage.rs
@@ -226,7 +226,9 @@ impl SigVerifyStage {
         Builder::new()
             .name("solana-verifier".to_string())
             .spawn(move || loop {
-                if let Err(e) = Self::verifier(&packet_receiver, &verified_sender, &verifier, &mut stats) {
+                if let Err(e) =
+                    Self::verifier(&packet_receiver, &verified_sender, &verifier, &mut stats)
+                {
                     match e {
                         SigVerifyServiceError::Streamer(StreamerError::RecvTimeout(
                             RecvTimeoutError::Disconnected,

diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/programs/compute-budget/Cargo.toml b/programs/compute-budget/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "solana-compute-budget-program"
 description = "Solana Compute Budget program"
-version = "1.7.14"
+version = "1.7.15"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-compute-budget-program"
 repository = "https://github.com/solana-labs/solana"
@@ -10,7 +10,7 @@ license = "Apache-2.0"
 edition = "2018"
 
 [dependencies]
-solana-sdk = { path = "../../sdk", version = "=1.7.14" }
+solana-sdk = { path = "../../sdk", version = "=1.7.15" }
 
 [lib]
 crate-type = ["lib"]

diff --git a/streamer/src/streamer.rs b/streamer/src/streamer.rs
@@ -140,7 +140,7 @@ pub fn recv_batch(recvr: &PacketReceiver) -> Result<(Vec<Packets>, usize, u64)>
     }
     let recv_duration = recv_start.elapsed();
     trace!("batch len {}", batch.len());
-    Ok((batch, len, recv_duration))
+    Ok((batch, len, solana_sdk::timing::duration_as_ms(&recv_duration)))
 }
 
 pub fn responder(