forked/h2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc renames (#202)

Browse Source 
This patch renames a number of types and functions making
the API more consistent.

* `Server` -> `Connection`
* `Client` -> `SendRequest`
* `Respond` -> `SendResponse`.

It also moves the handshake fns off of `Connection` and make
them free fns in the module. And `Connection::builder` is removed
in favor of `Builder::new`.
This commit is contained in:
Carl Lerche
2018-01-02 17:02:17 -08:00
committed by GitHub
parent 26e7a2d416
commit d0b5b6246a
17 changed files with 299 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/client_request.rs
View File

@@ -13,7 +13,7 @@ fn handshake() {
.write(SETTINGS_ACK)
.build();
let (_, h2) = Client::handshake(mock).wait().unwrap();
let (_, h2) = client::handshake(mock).wait().unwrap();
trace!("hands have been shook");
@@ -37,7 +37,7 @@ fn client_other_thread() {
.send_frame(frames::headers(1).response(200).eos())
.close();
let h2 = Client::handshake(io)
let h2 = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, h2)| {
::std::thread::spawn(move || {
@@ -76,7 +76,7 @@ fn recv_invalid_server_stream_id() {
.write(&[0, 0, 8, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1])
.build();
let (mut client, h2) = Client::handshake(mock).wait().unwrap();
let (mut client, h2) = client::handshake(mock).wait().unwrap();
// Send the request
let request = Request::builder()
@@ -100,7 +100,7 @@ fn request_stream_id_overflows() {
let (io, srv) = mock::new();
let h2 = Client::builder()
let h2 = client::Builder::new()
.initial_stream_id(::std::u32::MAX >> 1)
.handshake::<_, Bytes>(io)
.expect("handshake")
@@ -172,7 +172,7 @@ fn client_builder_max_concurrent_streams() {
.send_frame(frames::headers(1).response(200).eos())
.close();
let mut builder = Client::builder();
let mut builder = client::Builder::new();
builder.max_concurrent_streams(1);
let h2 = builder
@@ -219,7 +219,7 @@ fn request_over_max_concurrent_streams_errors() {
.send_frame(frames::data(5, "").eos())
.close();
let h2 = Client::handshake(io)
let h2 = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, h2)| {
// we send a simple req here just to drive the connection so we can
@@ -294,7 +294,7 @@ fn http_11_request_without_scheme_or_authority() {
.send_frame(frames::headers(1).response(200).eos())
.close();
let h2 = Client::handshake(io)
let h2 = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, h2)| {
// we send a simple req here just to drive the connection so we can
@@ -324,7 +324,7 @@ fn http_2_request_without_scheme_or_authority() {
.recv_settings()
.close();
let h2 = Client::handshake(io)
let h2 = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, h2)| {
// we send a simple req here just to drive the connection so we can
@@ -367,7 +367,7 @@ fn request_with_connection_headers() {
("te", "boom"),
];
let client = Client::handshake(io)
let client = client::handshake(io)
.expect("handshake")
.and_then(move |(mut client, conn)| {
for (name, val) in headers {
@@ -402,7 +402,7 @@ fn connection_close_notifies_response_future() {
// don't send any response, just close
.close();
let client = Client::handshake(io)
let client = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, conn)| {
let request = Request::builder()
@@ -444,7 +444,7 @@ fn connection_close_notifies_client_poll_ready() {
)
.close();
let client = Client::handshake(io)
let client = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, conn)| {
let request = Request::builder()
@@ -497,7 +497,7 @@ fn sending_request_on_closed_connection() {
.send_frame(frames::headers(0).response(200).eos())
.close();
let h2 = Client::handshake(io)
let h2 = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, h2)| {
let request = Request::builder()

2
tests/codec_write.rs
View File

@@ -27,7 +27,7 @@ fn write_continuation_frames() {
)
.close();
let client = Client::handshake(io)
let client = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, conn)| {
let mut request = Request::builder();

38
tests/flow_control.rs
View File

@@ -27,7 +27,7 @@ fn send_data_without_requesting_capacity() {
.read(&[0, 0, 1, 1, 5, 0, 0, 0, 1, 0x89])
.build();
let (mut client, mut h2) = Client::handshake(mock).wait().unwrap();
let (mut client, mut h2) = client::handshake(mock).wait().unwrap();
let request = Request::builder()
.method(Method::POST)
@@ -82,7 +82,7 @@ fn release_capacity_sends_window_update() {
// gotta end the connection
.map(drop);
let h2 = Client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let h2 = client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let request = Request::builder()
.method(Method::GET)
.uri("https://http2.akamai.com/")
@@ -147,7 +147,7 @@ fn release_capacity_of_small_amount_does_not_send_window_update() {
// gotta end the connection
.map(drop);
let h2 = Client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let h2 = client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let request = Request::builder()
.method(Method::GET)
.uri("https://http2.akamai.com/")
@@ -216,7 +216,7 @@ fn recv_data_overflows_connection_window() {
.recv_frame(frames::go_away(0).flow_control());
// connection is ended by client
let h2 = Client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let h2 = client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let request = Request::builder()
.method(Method::GET)
.uri("https://http2.akamai.com/")
@@ -279,7 +279,7 @@ fn recv_data_overflows_stream_window() {
.recv_frame(frames::reset(1).flow_control())
.close();
let h2 = Client::builder()
let h2 = client::Builder::new()
.initial_window_size(16_384)
.handshake::<_, Bytes>(io)
.unwrap()
@@ -348,7 +348,7 @@ fn stream_error_release_connection_capacity() {
.recv_frame(frames::window_update(0, 16_384 * 2 + 10))
.close();
let client = Client::handshake(io).unwrap()
let client = client::handshake(io).unwrap()
.and_then(|(mut client, conn)| {
let request = Request::builder()
.uri("https://http2.akamai.com/")
@@ -397,7 +397,7 @@ fn stream_close_by_data_frame_releases_capacity() {
let window_size = frame::DEFAULT_INITIAL_WINDOW_SIZE as usize;
let h2 = Client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let h2 = client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let request = Request::builder()
.method(Method::POST)
.uri("https://http2.akamai.com/")
@@ -468,7 +468,7 @@ fn stream_close_by_trailers_frame_releases_capacity() {
let window_size = frame::DEFAULT_INITIAL_WINDOW_SIZE as usize;
let h2 = Client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let h2 = client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let request = Request::builder()
.method(Method::POST)
.uri("https://http2.akamai.com/")
@@ -551,7 +551,7 @@ fn recv_window_update_on_stream_closed_by_data_frame() {
let _ = ::env_logger::init();
let (io, srv) = mock::new();
let h2 = Client::handshake(io)
let h2 = client::handshake(io)
.unwrap()
.and_then(|(mut client, h2)| {
let request = Request::builder()
@@ -600,7 +600,7 @@ fn reserved_capacity_assigned_in_multi_window_updates() {
let _ = ::env_logger::init();
let (io, srv) = mock::new();
let h2 = Client::handshake(io)
let h2 = client::handshake(io)
.unwrap()
.and_then(|(mut client, h2)| {
let request = Request::builder()
@@ -729,7 +729,7 @@ fn connection_notified_on_released_capacity() {
let th2 = thread::spawn(move || {
let (mut client, h2) = Client::handshake(io).wait().unwrap();
let (mut client, h2) = client::handshake(io).wait().unwrap();
let (h2, _) = h2.drive(settings_rx).wait().unwrap();
@@ -809,7 +809,7 @@ fn recv_settings_removes_available_capacity() {
.close();
let h2 = Client::handshake(io).unwrap()
let h2 = client::handshake(io).unwrap()
.and_then(|(mut client, h2)| {
let request = Request::builder()
.method(Method::POST)
@@ -870,7 +870,7 @@ fn recv_no_init_window_then_receive_some_init_window() {
.close();
let h2 = Client::handshake(io).unwrap()
let h2 = client::handshake(io).unwrap()
.and_then(|(mut client, h2)| {
let request = Request::builder()
.method(Method::POST)
@@ -971,7 +971,7 @@ fn settings_lowered_capacity_returns_capacity_to_connection() {
.wait().unwrap();
});
let (mut client, h2) = Client::handshake(io).unwrap()
let (mut client, h2) = client::handshake(io).unwrap()
.wait().unwrap();
// Drive client connection
@@ -1034,7 +1034,7 @@ fn client_increase_target_window_size() {
.close();
let client = Client::handshake(io).unwrap()
let client = client::handshake(io).unwrap()
.and_then(|(_client, mut conn)| {
conn.set_target_window_size(2 << 20);
@@ -1062,7 +1062,7 @@ fn increase_target_window_size_after_using_some() {
.recv_frame(frames::window_update(0, (2 << 20) - 65_535))
.close();
let client = Client::handshake(io).unwrap()
let client = client::handshake(io).unwrap()
.and_then(|(mut client, conn)| {
let request = Request::builder()
.uri("https://http2.akamai.com/")
@@ -1105,7 +1105,7 @@ fn decrease_target_window_size() {
.recv_frame(frames::window_update(0, 16_384))
.close();
let client = Client::handshake(io).unwrap()
let client = client::handshake(io).unwrap()
.and_then(|(mut client, mut conn)| {
conn.set_target_window_size(16_384 * 2);
@@ -1142,7 +1142,7 @@ fn server_target_window_size() {
.recv_frame(frames::window_update(0, (2 << 20) - 65_535))
.close();
let srv = Server::handshake(io).unwrap()
let srv = server::handshake(io).unwrap()
.and_then(|mut conn| {
conn.set_target_window_size(2 << 20);
conn.into_future().unwrap()
@@ -1180,7 +1180,7 @@ fn recv_settings_increase_window_size_after_using_some() {
.send_frame(frames::headers(1).response(200).eos())
.close();
let client = Client::handshake(io).unwrap()
let client = client::handshake(io).unwrap()
.and_then(|(mut client, conn)| {
let request = Request::builder()
.method("POST")

6
tests/ping_pong.rs
View File

@@ -8,7 +8,7 @@ fn recv_single_ping() {
let (m, mock) = mock::new();
// Create the handshake
let h2 = Client::handshake(m)
let h2 = client::handshake(m)
.unwrap()
.and_then(|(_, conn)| conn.unwrap());
@@ -49,7 +49,7 @@ fn recv_multiple_pings() {
.recv_frame(frames::ping([2; 8]).pong())
.close();
let srv = Server::handshake(io)
let srv = server::handshake(io)
.expect("handshake")
.and_then(|srv| {
// future of first request, which never comes
@@ -79,7 +79,7 @@ fn pong_has_highest_priority() {
.recv_frame(frames::headers(1).response(200).eos())
.close();
let srv = Server::handshake(io)
let srv = server::handshake(io)
.expect("handshake")
.and_then(|srv| {
// future of first request

10
tests/prioritization.rs
View File

@@ -26,7 +26,7 @@ fn single_stream_send_large_body() {
.build();
let notify = MockNotify::new();
let (mut client, mut h2) = Client::handshake(mock).wait().unwrap();
let (mut client, mut h2) = client::handshake(mock).wait().unwrap();
// Poll h2 once to get notifications
loop {
@@ -94,7 +94,7 @@ fn single_stream_send_extra_large_body_multi_frames_one_buffer() {
.build();
let notify = MockNotify::new();
let (mut client, mut h2) = Client::handshake(mock).wait().unwrap();
let (mut client, mut h2) = client::handshake(mock).wait().unwrap();
// Poll h2 once to get notifications
loop {
@@ -181,7 +181,7 @@ fn single_stream_send_body_greater_than_default_window() {
.build();
let notify = MockNotify::new();
let (mut client, mut h2) = Client::handshake(mock).wait().unwrap();
let (mut client, mut h2) = client::handshake(mock).wait().unwrap();
// Poll h2 once to get notifications
loop {
@@ -265,7 +265,7 @@ fn single_stream_send_extra_large_body_multi_frames_multi_buffer() {
.read(&[0, 0, 1, 1, 5, 0, 0, 0, 1, 0x89])
.build();
let (mut client, mut h2) = Client::handshake(mock).wait().unwrap();
let (mut client, mut h2) = client::handshake(mock).wait().unwrap();
let request = Request::builder()
.method(Method::POST)
@@ -296,7 +296,7 @@ fn send_data_receive_window_update() {
let _ = ::env_logger::init();
let (m, mock) = mock::new();
let h2 = Client::handshake(m)
let h2 = client::handshake(m)
.unwrap()
.and_then(|(mut client, h2)| {
let request = Request::builder()

6
tests/push_promise.rs
View File

@@ -20,7 +20,7 @@ fn recv_push_works() {
.send_frame(frames::headers(1).response(200).eos())
.send_frame(frames::headers(2).response(200).eos());
let h2 = Client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let h2 = client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let request = Request::builder()
.method(Method::GET)
.uri("https://http2.akamai.com/")
@@ -58,7 +58,7 @@ fn recv_push_when_push_disabled_is_conn_error() {
.send_frame(frames::headers(1).response(200).eos())
.recv_frame(frames::go_away(0).protocol_error());
let h2 = Client::builder()
let h2 = client::Builder::new()
.enable_push(false)
.handshake::<_, Bytes>(io)
.unwrap()
@@ -115,7 +115,7 @@ fn pending_push_promises_reset_when_dropped() {
.recv_frame(frames::reset(2).cancel())
.close();
let client = Client::handshake(io).unwrap().and_then(|(mut client, conn)| {
let client = client::handshake(io).unwrap().and_then(|(mut client, conn)| {
let request = Request::builder()
.method(Method::GET)
.uri("https://http2.akamai.com/")

12
tests/server.rs
View File

@@ -17,7 +17,7 @@ fn read_preface_in_multiple_frames() {
.read(SETTINGS_ACK)
.build();
let h2 = Server::handshake(mock).wait().unwrap();
let h2 = server::handshake(mock).wait().unwrap();
assert!(Stream::wait(h2).next().is_none());
}
@@ -47,7 +47,7 @@ fn server_builder_set_max_concurrent_streams() {
.recv_frame(frames::headers(1).response(200).eos())
.close();
let mut builder = Server::builder();
let mut builder = server::Builder::new();
builder.max_concurrent_streams(1);
let h2 = builder
@@ -89,7 +89,7 @@ fn serve_request() {
.recv_frame(frames::headers(1).response(200).eos())
.close();
let srv = Server::handshake(io).expect("handshake").and_then(|srv| {
let srv = server::handshake(io).expect("handshake").and_then(|srv| {
srv.into_future().unwrap().and_then(|(reqstream, srv)| {
let (req, mut stream) = reqstream.unwrap();
@@ -129,7 +129,7 @@ fn recv_invalid_authority() {
.recv_frame(frames::reset(1).protocol_error())
.close();
let srv = Server::handshake(io)
let srv = server::handshake(io)
.expect("handshake")
.and_then(|srv| srv.into_future().unwrap());
@@ -164,7 +164,7 @@ fn recv_connection_header() {
.recv_frame(frames::reset(9).protocol_error())
.close();
let srv = Server::handshake(io)
let srv = server::handshake(io)
.expect("handshake")
.and_then(|srv| srv.into_future().unwrap());
@@ -188,7 +188,7 @@ fn sends_reset_cancel_when_body_is_dropped() {
.recv_frame(frames::reset(1).cancel())
.close();
let srv = Server::handshake(io).expect("handshake").and_then(|srv| {
let srv = server::handshake(io).expect("handshake").and_then(|srv| {
srv.into_future().unwrap().and_then(|(reqstream, srv)| {
let (req, mut stream) = reqstream.unwrap();

28
tests/stream_states.rs
View File

@@ -20,7 +20,7 @@ fn send_recv_headers_only() {
.read(&[0, 0, 1, 1, 5, 0, 0, 0, 1, 0x89])
.build();
let (mut client, mut h2) = Client::handshake(mock).wait().unwrap();
let (mut client, mut h2) = client::handshake(mock).wait().unwrap();
// Send the request
let request = Request::builder()
@@ -62,7 +62,7 @@ fn send_recv_data() {
])
.build();
let (mut client, mut h2) = Client::builder().handshake(mock).wait().unwrap();
let (mut client, mut h2) = client::Builder::new().handshake(mock).wait().unwrap();
let request = Request::builder()
.method(Method::POST)
@@ -119,7 +119,7 @@ fn send_headers_recv_data_single_frame() {
])
.build();
let (mut client, mut h2) = Client::handshake(mock).wait().unwrap();
let (mut client, mut h2) = client::handshake(mock).wait().unwrap();
// Send the request
let request = Request::builder()
@@ -154,7 +154,7 @@ fn closed_streams_are_released() {
let _ = ::env_logger::init();
let (io, srv) = mock::new();
let h2 = Client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let h2 = client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let request = Request::get("https://example.com/").body(()).unwrap();
// Send request
@@ -199,7 +199,7 @@ fn errors_if_recv_frame_exceeds_max_frame_size() {
let _ = ::env_logger::init();
let (io, mut srv) = mock::new();
let h2 = Client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let h2 = client::handshake(io).unwrap().and_then(|(mut client, h2)| {
let request = Request::builder()
.method(Method::GET)
.uri("https://example.com/")
@@ -254,7 +254,7 @@ fn configure_max_frame_size() {
let _ = ::env_logger::init();
let (io, mut srv) = mock::new();
let h2 = Client::builder()
let h2 = client::Builder::new()
.max_frame_size(16_384 * 2)
.handshake::<_, Bytes>(io)
.expect("handshake")
@@ -325,7 +325,7 @@ fn recv_goaway_finishes_processed_streams() {
.recv_frame(frames::go_away(0));
//.close();
let h2 = Client::handshake(io)
let h2 = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, h2)| {
let request = Request::builder()
@@ -396,7 +396,7 @@ fn recv_next_stream_id_updated_by_malformed_headers() {
.recv_frame(frames::go_away(1).protocol_error())
.close();
let srv = Server::handshake(io)
let srv = server::handshake(io)
.expect("handshake")
.and_then(|srv| srv.into_future().then(|res| {
let (err, _) = res.unwrap_err();
@@ -429,7 +429,7 @@ fn skipped_stream_ids_are_implicitly_closed() {
// implicitly closed.
.send_frame(frames::headers(3).response(200));
let h2 = Client::builder()
let h2 = client::Builder::new()
.initial_stream_id(5)
.handshake::<_, Bytes>(io)
.expect("handshake")
@@ -491,7 +491,7 @@ fn send_rst_stream_allows_recv_data() {
.ping_pong([1; 8])
.close();
let client = Client::handshake(io)
let client = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, conn)| {
let request = Request::builder()
@@ -540,7 +540,7 @@ fn send_rst_stream_allows_recv_trailers() {
.ping_pong([1; 8])
.close();
let client = Client::handshake(io)
let client = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, conn)| {
let request = Request::builder()
@@ -591,7 +591,7 @@ fn rst_stream_expires() {
.recv_frame(frames::go_away(0).protocol_error())
.close();
let client = Client::builder()
let client = client::Builder::new()
.reset_stream_duration(Duration::from_millis(10))
.handshake::<_, Bytes>(io)
.expect("handshake")
@@ -663,7 +663,7 @@ fn rst_stream_max() {
.recv_frame(frames::go_away(0).protocol_error())
.close();
let client = Client::builder()
let client = client::Builder::new()
.max_concurrent_reset_streams(1)
.handshake::<_, Bytes>(io)
.expect("handshake")
@@ -744,7 +744,7 @@ fn reserved_state_recv_window_update() {
.ping_pong([1; 8])
.close();
let client = Client::handshake(io)
let client = client::handshake(io)
.expect("handshake")
.and_then(|(mut client, conn)| {
let request = Request::builder()

4
tests/support/prelude.rs
View File

@@ -3,9 +3,9 @@
pub use super::h2;
pub use self::h2::*;
pub use self::h2::client::{self, Client};
pub use self::h2::client;
pub use self::h2::frame::StreamId;
pub use self::h2::server::{self, Server};
pub use self::h2::server;
// Re-export mock
pub use super::mock::{self, HandleFutureExt};

4
tests/trailers.rs
View File

@@ -23,7 +23,7 @@ fn recv_trailers_only() {
])
.build();
let (mut client, mut h2) = Client::handshake(mock).wait().unwrap();
let (mut client, mut h2) = client::handshake(mock).wait().unwrap();
// Send the request
let request = Request::builder()
@@ -71,7 +71,7 @@ fn send_trailers_immediately() {
])
.build();
let (mut client, mut h2) = Client::handshake(mock).wait().unwrap();
let (mut client, mut h2) = client::handshake(mock).wait().unwrap();
// Send the request
let request = Request::builder()