Skip to content

Commit

Permalink
chore: Bump paperclip from 0.7.0 to 0.8.0 (near#8392)
Browse files Browse the repository at this point in the history
To unblock serde_yaml update for near#8320

I wasn't sure what the policy was, so updated to the latest version of `paperclip` crate. Please, let me know if I should chose some other version instead.

There is another very similar PR happening in parallel near#8390 that is also necessary for the `serde_yaml` update and is blocking this PR, so feel free to take a look at that one as well ^^
  • Loading branch information
aborg-dev authored and nikurt committed Jan 30, 2023
1 parent db56b9f commit d16bd77
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 51 deletions.
107 changes: 65 additions & 42 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ openssl-probe = "0.1.4"
opentelemetry = { version = "0.17.0", features = ["rt-tokio", "trace"] }
opentelemetry-otlp = "0.10.0"
opentelemetry-semantic-conventions = "0.9.0"
paperclip = { version = "0.7.0", features = ["actix4"] }
paperclip = { version = "0.8.0", features = ["actix4"] }
parity-wasm = { version = "0.42", default-features = false }
parity-wasm_41 = { package = "parity-wasm", version = "0.41" }
parking_lot = "0.12.1"
Expand Down Expand Up @@ -172,7 +172,7 @@ serde = { version = "1.0.136", features = ["alloc", "derive", "rc"] }
serde_ignored = "0.1"
serde_json = "1.0.68"
serde_repr = "0.1.8"
serde_yaml = "0.8.26"
serde_yaml = "0.9"
sha2 = "0.10"
sha3 = "0.10"
shell-escape = "0.1.5"
Expand Down
8 changes: 1 addition & 7 deletions core/primitives/src/runtime/parameter_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ pub(crate) enum InvalidConfigError {
impl std::str::FromStr for ParameterTable {
type Err = InvalidConfigError;
fn from_str(arg: &str) -> Result<ParameterTable, InvalidConfigError> {
// TODO(#8320): Remove this after migration to `serde_yaml` 0.9 that supports empty strings.
if arg.is_empty() {
return Ok(ParameterTable { parameters: BTreeMap::new() });
}

let yaml_map: BTreeMap<String, serde_yaml::Value> =
serde_yaml::from_str(arg).map_err(|err| InvalidConfigError::InvalidYaml(err))?;

Expand Down Expand Up @@ -586,8 +581,7 @@ burnt_gas_reward: {
fn test_parameter_table_no_key() {
assert_matches!(
check_invalid_parameter_table(": 100", &[]),
// TODO(#8320): This must be invalid YAML after migration to `serde_yaml` 0.9.
InvalidConfigError::UnknownParameter(_, _)
InvalidConfigError::InvalidYaml(_)
);
}

Expand Down

0 comments on commit d16bd77

Please sign in to comment.