zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(deps): Replace `serde_yaml` by `serde_yml` (#8825) 

* Use `serde_yml` instead of `serde_yaml`

* Regenerate `openapi.yaml`
This commit is contained in:
Marek 2024-09-02 21:00:26 +02:00 committed by GitHub
parent 6b95d271d8
commit 9a616f46a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Cargo.lock
View File

@ -2434,6 +2434,16 @@ dependencies = [
"lz4-sys", "lz4-sys",
] ]
[[package]]
name = "libyml"
version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3302702afa434ffa30847a83305f0a69d6abd74293b6554c18ec85c7ef30c980"
dependencies = [
"anyhow",
"version_check",
]
[[package]] [[package]]
name = "libz-sys" name = "libz-sys"
version = "1.1.18" version = "1.1.18"
@ -4071,16 +4081,18 @@ dependencies = [
] ]
[[package]] [[package]]
name = "serde_yaml" name = "serde_yml"
version = "0.9.34+deprecated" version = "0.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" checksum = "59e2dd588bf1597a252c3b920e0143eb99b0f76e4e082f4c92ce34fbc9e71ddd"
dependencies = [ dependencies = [
"indexmap 2.3.0", "indexmap 2.3.0",
"itoa", "itoa",
"libyml",
"memchr",
"ryu", "ryu",
"serde", "serde",
"unsafe-libyaml", "version_check",
] ]
[[package]] [[package]]
@ -5018,12 +5030,6 @@ dependencies = [
"subtle", "subtle",
] ]
[[package]]
name = "unsafe-libyaml"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
[[package]] [[package]]
name = "untrusted" name = "untrusted"
version = "0.9.0" version = "0.9.0"
@ -5108,9 +5114,9 @@ dependencies = [
[[package]] [[package]]
name = "version_check" name = "version_check"
version = "0.9.4" version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]] [[package]]
name = "visibility" name = "visibility"
@ -6318,7 +6324,7 @@ dependencies = [
"reqwest", "reqwest",
"serde", "serde",
"serde_json", "serde_json",
"serde_yaml", "serde_yml",
"structopt", "structopt",
"syn 2.0.72", "syn 2.0.72",
"thiserror", "thiserror",

52
openapi.yaml
View File

@ -28,7 +28,7 @@ paths:
default: getinfo default: getinfo
id: id:
type: string type: string
default: x2r3lRddGL default: VuJXrxLSw8
params: params:
type: array type: array
items: {} items: {}
@ -61,7 +61,7 @@ paths:
default: getblockchaininfo default: getblockchaininfo
id: id:
type: string type: string
default: w8Lb0nAvLd default: HDVqYXM9m6
params: params:
type: array type: array
items: {} items: {}
@ -99,7 +99,7 @@ paths:
default: getaddressbalance default: getaddressbalance
id: id:
type: string type: string
default: QbTztoTvRo default: Xw5TDBKXGl
params: params:
type: array type: array
items: {} items: {}
@ -147,7 +147,7 @@ paths:
default: sendrawtransaction default: sendrawtransaction
id: id:
type: string type: string
default: aDK5RQWj16 default: QaJv2bXyZu
params: params:
type: array type: array
items: {} items: {}
@ -196,7 +196,7 @@ paths:
default: getblock default: getblock
id: id:
type: string type: string
default: xxCP1d61X0 default: k0DACJrgZs
params: params:
type: array type: array
items: {} items: {}
@ -239,7 +239,7 @@ paths:
default: getbestblockhash default: getbestblockhash
id: id:
type: string type: string
default: DoZgd1j7xW default: rIFaLhZwHF
params: params:
type: array type: array
items: {} items: {}
@ -272,7 +272,7 @@ paths:
default: getbestblockheightandhash default: getbestblockheightandhash
id: id:
type: string type: string
default: 0iUFHsOjk3 default: oxrhh1swvh
params: params:
type: array type: array
items: {} items: {}
@ -305,7 +305,7 @@ paths:
default: getrawmempool default: getrawmempool
id: id:
type: string type: string
default: WXG2c6FcCK default: E7oUD34jk2
params: params:
type: array type: array
items: {} items: {}
@ -343,7 +343,7 @@ paths:
default: z_gettreestate default: z_gettreestate
id: id:
type: string type: string
default: 38P0xXV0do default: Hp22XK728i
params: params:
type: array type: array
items: {} items: {}
@ -393,7 +393,7 @@ paths:
default: z_getsubtreesbyindex default: z_getsubtreesbyindex
id: id:
type: string type: string
default: 662iR8VZGT default: Cs69hg68pl
params: params:
type: array type: array
items: {} items: {}
@ -432,7 +432,7 @@ paths:
default: getrawtransaction default: getrawtransaction
id: id:
type: string type: string
default: UuvVrzSzqC default: iu395PEErc
params: params:
type: array type: array
items: {} items: {}
@ -480,7 +480,7 @@ paths:
default: getaddresstxids default: getaddresstxids
id: id:
type: string type: string
default: KMss2wDMwH default: z3lOKfsQdp
params: params:
type: array type: array
items: {} items: {}
@ -528,7 +528,7 @@ paths:
default: getaddressutxos default: getaddressutxos
id: id:
type: string type: string
default: 4Y6BAhe6Lf default: '7U4Q4dSxej'
params: params:
type: array type: array
items: {} items: {}
@ -571,7 +571,7 @@ paths:
default: getblockcount default: getblockcount
id: id:
type: string type: string
default: nzPm5W3X1G default: '8yw3EX7Cwi'
params: params:
type: array type: array
items: {} items: {}
@ -609,7 +609,7 @@ paths:
default: getblockhash default: getblockhash
id: id:
type: string type: string
default: KLKosq2Z8E default: ndDYksCl9E
params: params:
type: array type: array
items: {} items: {}
@ -657,7 +657,7 @@ paths:
default: getblocktemplate default: getblocktemplate
id: id:
type: string type: string
default: spj7gKe2AA default: lJi2hfxty1
params: params:
type: array type: array
items: {} items: {}
@ -695,7 +695,7 @@ paths:
default: submitblock default: submitblock
id: id:
type: string type: string
default: QOQsC3nA7z default: '9fEFOdTQle'
params: params:
type: array type: array
items: {} items: {}
@ -728,7 +728,7 @@ paths:
default: getmininginfo default: getmininginfo
id: id:
type: string type: string
default: Si3Sdb9ICT default: Dytpq4f3lF
params: params:
type: array type: array
items: {} items: {}
@ -761,7 +761,7 @@ paths:
default: getnetworksolps default: getnetworksolps
id: id:
type: string type: string
default: jWvKPdOxDa default: yX3woRnOaN
params: params:
type: array type: array
items: {} items: {}
@ -794,7 +794,7 @@ paths:
default: getnetworkhashps default: getnetworkhashps
id: id:
type: string type: string
default: wnFwBVFrN0 default: AyAZMtbezv
params: params:
type: array type: array
items: {} items: {}
@ -827,7 +827,7 @@ paths:
default: getpeerinfo default: getpeerinfo
id: id:
type: string type: string
default: NpKiq59CE8 default: nNcrsu3ZAR
params: params:
type: array type: array
items: {} items: {}
@ -865,7 +865,7 @@ paths:
default: validateaddress default: validateaddress
id: id:
type: string type: string
default: PDjTChWgFW default: LGyfO7zTjW
params: params:
type: array type: array
items: {} items: {}
@ -903,7 +903,7 @@ paths:
default: z_validateaddress default: z_validateaddress
id: id:
type: string type: string
default: aCeb6xbIuo default: '2Q09a2Nh4N'
params: params:
type: array type: array
items: {} items: {}
@ -941,7 +941,7 @@ paths:
default: getblocksubsidy default: getblocksubsidy
id: id:
type: string type: string
default: EeBvVXCJon default: nv6lOWCRso
params: params:
type: array type: array
items: {} items: {}
@ -984,7 +984,7 @@ paths:
default: getdifficulty default: getdifficulty
id: id:
type: string type: string
default: jg2K8N0ZG4 default: '2O3A0PF1SS'
params: params:
type: array type: array
items: {} items: {}
@ -1022,7 +1022,7 @@ paths:
default: z_listunifiedreceivers default: z_listunifiedreceivers
id: id:
type: string type: string
default: Y3gscsg8yT default: XYgGcDIx2X
params: params:
type: array type: array
items: {} items: {}

5
supply-chain/config.toml
View File

@ -1,4 +1,3 @@
# cargo-vet config file # cargo-vet config file
[cargo-vet] [cargo-vet]
@ -1414,10 +1413,6 @@ criteria = "safe-to-deploy"
version = "3.8.1" version = "3.8.1"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"
[[exemptions.serde_yaml]]
version = "0.9.34+deprecated"
criteria = "safe-to-deploy"
[[exemptions.sha2]] [[exemptions.sha2]]
version = "0.10.8" version = "0.10.8"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"

4
zebra-utils/Cargo.toml
View File

@ -77,7 +77,7 @@ openapi-generator = [
"zebra-rpc", "zebra-rpc",
"syn", "syn",
"quote", "quote",
"serde_yaml", "serde_yml",
"serde" "serde"
] ]
@ -121,7 +121,7 @@ zcash_protocol.workspace = true
rand = "0.8.5" rand = "0.8.5"
syn = { version = "2.0.72", features = ["full"], optional = true } syn = { version = "2.0.72", features = ["full"], optional = true }
quote = { version = "1.0.36", optional = true } quote = { version = "1.0.36", optional = true }
serde_yaml = { version = "0.9.34+deprecated", optional = true } serde_yml = { version = "0.0.12", optional = true }
serde = { version = "1.0.204", features = ["serde_derive"], optional = true } serde = { version = "1.0.204", features = ["serde_derive"], optional = true }
indexmap = "2.3.0" indexmap = "2.3.0"

4
zebra-utils/src/bin/openapi-generator/main.rs
View File

@ -174,9 +174,9 @@ fn main() -> Result<(), Box<dyn Error>> {
let all_methods = Methods { paths: methods }; let all_methods = Methods { paths: methods };
// Add openapi header and write to file // Add openapi header and write to file
let yaml_string = serde_yaml::to_string(&all_methods)?; let yml_string = serde_yml::to_string(&all_methods)?;
let mut w = File::create("openapi.yaml")?; let mut w = File::create("openapi.yaml")?;
w.write_all(format!("{}{}", create_yaml(), yaml_string).as_bytes())?; w.write_all(format!("{}{}", create_yaml(), yml_string).as_bytes())?;
Ok(()) Ok(())
} }