From 74cc2e5ffac5c0c7bbb9126f27d25a1704366b41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Aug 2021 11:57:22 -0600
Subject: [PATCH] chore: bump tungstenite from 0.14.0 to 0.15.0 (#19222)

* chore: bump tungstenite from 0.14.0 to 0.15.0

Bumps [tungstenite](https://github.com/snapview/tungstenite-rs) from 0.14.0 to 0.15.0.
- [Release notes](https://github.com/snapview/tungstenite-rs/releases)
- [Changelog](https://github.com/snapview/tungstenite-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/snapview/tungstenite-rs/compare/v0.14.0...v0.15.0)

---
updated-dependencies:
- dependency-name: tungstenite
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* [auto-commit] Update all Cargo lock files

* Update stream type

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot-buildkite <anatoly+githubjenkins@solana.io>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
---
 Cargo.lock                  | 4 ++--
 client/Cargo.toml           | 2 +-
 client/src/pubsub_client.rs | 9 +++++----
 programs/bpf/Cargo.lock     | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 78d52e59ca..5ee1ba4c07 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6881,9 +6881,9 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 
 [[package]]
 name = "tungstenite"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5"
+checksum = "983d40747bce878d2fb67d910dcb8bd3eca2b2358540c3cc1b98c027407a3ae3"
 dependencies = [
  "base64 0.13.0",
  "byteorder",
diff --git a/client/Cargo.toml b/client/Cargo.toml
index bed0dab715..9fdef9be21 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -34,7 +34,7 @@ solana-version = { path = "../version", version = "=1.8.0" }
 solana-vote-program = { path = "../programs/vote", version = "=1.8.0" }
 thiserror = "1.0"
 tokio = { version = "1", features = ["full"] }
-tungstenite = "0.14.0"
+tungstenite = "0.15.0"
 url = "2.2.2"
 
 [dev-dependencies]
diff --git a/client/src/pubsub_client.rs b/client/src/pubsub_client.rs
index d3dd63bcc3..696d8e30ca 100644
--- a/client/src/pubsub_client.rs
+++ b/client/src/pubsub_client.rs
@@ -17,6 +17,7 @@ use {
     solana_sdk::signature::Signature,
     std::{
         marker::PhantomData,
+        net::TcpStream,
         sync::{
             atomic::{AtomicBool, Ordering},
             mpsc::{channel, Receiver},
@@ -25,7 +26,7 @@ use {
         thread::JoinHandle,
     },
     thiserror::Error,
-    tungstenite::{client::AutoStream, connect, Message, WebSocket},
+    tungstenite::{connect, stream::MaybeTlsStream, Message, WebSocket},
     url::{ParseError, Url},
 };
 
@@ -50,7 +51,7 @@ where
 {
     message_type: PhantomData<T>,
     operation: &'static str,
-    socket: Arc<RwLock<WebSocket<AutoStream>>>,
+    socket: Arc<RwLock<WebSocket<MaybeTlsStream<TcpStream>>>>,
     subscription_id: u64,
     t_cleanup: Option<JoinHandle<()>>,
     exit: Arc<AtomicBool>,
@@ -76,7 +77,7 @@ where
     T: DeserializeOwned,
 {
     fn send_subscribe(
-        writable_socket: &Arc<RwLock<WebSocket<AutoStream>>>,
+        writable_socket: &Arc<RwLock<WebSocket<MaybeTlsStream<TcpStream>>>>,
         body: String,
     ) -> Result<u64, PubsubClientError> {
         writable_socket
@@ -118,7 +119,7 @@ where
     }
 
     fn read_message(
-        writable_socket: &Arc<RwLock<WebSocket<AutoStream>>>,
+        writable_socket: &Arc<RwLock<WebSocket<MaybeTlsStream<TcpStream>>>>,
     ) -> Result<T, PubsubClientError> {
         let message = writable_socket.write().unwrap().read_message()?;
         let message_text = &message.into_text().unwrap();
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
index fdbe8f9d92..0c64d4b7ef 100644
--- a/programs/bpf/Cargo.lock
+++ b/programs/bpf/Cargo.lock
@@ -3806,9 +3806,9 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 
 [[package]]
 name = "tungstenite"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5"
+checksum = "983d40747bce878d2fb67d910dcb8bd3eca2b2358540c3cc1b98c027407a3ae3"
 dependencies = [
  "base64 0.13.0",
  "byteorder 1.4.3",