-
Notifications
You must be signed in to change notification settings - Fork 274
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump rand version to 0.8 and some other minor changes #688
base: master
Are you sure you want to change the base?
Conversation
edition = "2018" | ||
keywords = ["jsonrpc", "json-rpc", "json", "rpc", "serde"] | ||
|
||
[workspace.dependencies] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding workspace dependencies and also keeping mentions to crates in the workspace in the workspace dependencies.
Some(channel) => channel, | ||
None => break, | ||
}; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cleaner loop.
@@ -274,9 +269,9 @@ impl<T: Metadata, S: Middleware<T>> MetaIoHandler<T, S> { | |||
|
|||
let result = match (valid_version, self.methods.get(&method.method)) { | |||
(false, _) => Err(Error::invalid_version()), | |||
(true, Some(&RemoteProcedure::Method(ref method))) => Ok(call_method(method)), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unnecessary references.
parking_lot = "0.11.0" | ||
rand = "0.7" | ||
serde = "1.0" | ||
rand = "0.8" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Increased rand
version from 0.7
to 0.8
|
||
/// WebSockets Server Error | ||
#[derive(Debug)] | ||
pub enum Error { | ||
/// Io Error | ||
Io(io::Error), | ||
/// WebSockets Error | ||
WsError(ws::Error), | ||
WsError(Box<ws::Error>), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This variant of the enumeration is way larger than the other ones.
@sergejparity @mutantcornholio @alvicsam @niklasad1 @TarikGul @dvdplm @paritytech/ci @tomusdrw could someone please take a look whenever you can, and let me know what do you think? |
core-client/Cargo.toml
Outdated
@@ -27,7 +26,7 @@ arbitrary_precision = ["jsonrpc-client-transports/arbitrary_precision"] | |||
|
|||
[dependencies] | |||
jsonrpc-client-transports = { version = "18.0.0", path = "./transports", default-features = false } | |||
futures = { version = "0.3", features = [ "compat" ] } | |||
futures = { version = "0.3", features = ["compat"] } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
-futures = { version = "0.3", features = ["compat"] }
+futures = { workspace = true, features = ["compat"] }
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you're right, I'm fixing it.
test/Cargo.toml
Outdated
"jsonrpc-core-client/arbitrary_precision", | ||
"serde_json/arbitrary_precision", | ||
"jsonrpc-core/arbitrary_precision", | ||
] | ||
|
||
[dev-dependencies] | ||
jsonrpc-derive = { version = "18.0.0", path = "../derive" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use workspace dep?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jsonrpc-derive
was not in the workspace deps, but I can add it.
test/Cargo.toml
Outdated
jsonrpc-core = { version = "18.0.0", path = "../core" } | ||
jsonrpc-core-client = { version = "18.0.0", path = "../core-client" } | ||
jsonrpc-pubsub = { version = "18.0.0", path = "../pubsub" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use workspace dep?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
stdio/Cargo.toml
Outdated
|
||
[dependencies] | ||
futures = "0.3" | ||
futures.workspace = true | ||
jsonrpc-core = { version = "18.0.0", path = "../core" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use workspace dep?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
server-utils/Cargo.toml
Outdated
|
||
[dependencies] | ||
bytes = "1.0" | ||
futures = "0.3" | ||
futures.workspace = true | ||
globset = "0.4" | ||
jsonrpc-core = { version = "18.0.0", path = "../core" } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use workspace dep?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
@jayvdb I have added the changes you asked for. |
No description provided.