Skip to content

Commit

Permalink
Issue #25: Switch to Bincode2 (#36)
Browse files Browse the repository at this point in the history
Signed-off-by: Tom Kaitchuck <tom.kaitchuck@emc.com>
  • Loading branch information
tkaitchuck authored and shrids committed Jan 22, 2020
1 parent 61a7f29 commit 955b172
Show file tree
Hide file tree
Showing 8 changed files with 188 additions and 244 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Generated by Cargo
# will have compiled files and executables
/target/
/controller-client/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ members = [
[dependencies]
async-stream = "0.1.2"
async-trait = "0.1.17"
bincode = "1.2"
bincode2 = "2.0.1"
byteorder = "1.3"
futures = "0.3"
lazy_static = "1.4.0"
log = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_repr = "0.1"
snafu = "0.5.0"
snafu = "0.6.2"
tokio = { version = "0.2.8", features = ["full"] }

[dev-dependencies]
Expand Down
4 changes: 3 additions & 1 deletion controller-client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub use controller::{
scaling_policy::ScalingPolicyType, CreateScopeStatus, CreateStreamStatus, ScalingPolicy,
ScopeInfo, StreamConfig, StreamInfo,
};
use snafu::Snafu;
use snafu::{Backtrace, Snafu};
use tonic::transport::channel::Channel;
use tonic::{Code, Status};

Expand All @@ -36,12 +36,14 @@ pub enum ControllerError {
can_retry: bool,
operation: String,
error_msg: String,
backtrace: Backtrace,
},
#[snafu(display("Could not connect to controller {}", endpoint))]
ConnectionError {
can_retry: bool,
endpoint: String,
error_msg: String,
backtrace: Backtrace,
},
}

Expand Down
4 changes: 2 additions & 2 deletions controller-client/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fn test_create_scope_error() {
};
let fut = create_scope(request, &mut client);

rt.block_on(fut);
rt.block_on(fut).unwrap();
}

#[test]
Expand All @@ -41,5 +41,5 @@ fn test_create_stream_error() {
};
let fut = create_stream(request, &mut client);

rt.block_on(fut);
rt.block_on(fut).unwrap();
}
Loading

0 comments on commit 955b172

Please sign in to comment.