Sulkta-OSS/pallas
3
0
Fork 0
Code Issues 1 Pull requests 4 Projects Releases Packages Wiki Activity Actions

build(deps): minicbor-0.14, minicbor-derive-0.9.0, fix build (#63)

Browse source
This commit is contained in:
Rinor Hoxha 2022-02-28 15:01:39 +00:00 • committed by GitHub
parent f0c0887390
commit 6f2d117f9d
8 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pallas-crypto/Cargo.toml
View file

@ -13,7 +13,7 @@ authors = [
] ]
[dependencies] [dependencies]
minicbor = { version = "0.13" } minicbor = { version = "0.14" }
hex = "0.4" hex = "0.4"
cryptoxide = { version = "0.4.1" } cryptoxide = { version = "0.4.1" }
thiserror = "1.0" thiserror = "1.0"

2
pallas-crypto/src/hash/hash.rs
View file

@ -87,7 +87,7 @@ impl<'a, const BYTES: usize> Decode<'a> for Hash<BYTES> {
} else { } else {
// TODO: minicbor does not allow for expecting a specific size byte array // TODO: minicbor does not allow for expecting a specific size byte array
// (in fact cbor is not good at it at all anyway) // (in fact cbor is not good at it at all anyway)
Err(minicbor::decode::Error::Message("Invalid hash size")) Err(minicbor::decode::Error::message("Invalid hash size"))
} }
} }
} }

2
pallas-miniprotocols/Cargo.toml
View file

@ -14,7 +14,7 @@ authors = [
[dependencies] [dependencies]
pallas-multiplexer = { version = "0.5.0", path = "../pallas-multiplexer/" } pallas-multiplexer = { version = "0.5.0", path = "../pallas-multiplexer/" }
minicbor = { version="0.13", features=["half", "std"] } minicbor = { version="0.14", features=["half", "std"] }
log = "0.4.14" log = "0.4.14"
hex = "0.4.3" hex = "0.4.3"
itertools = "0.10.3" itertools = "0.10.3"

4
pallas-miniprotocols/src/payloads.rs
View file

@ -146,8 +146,8 @@ impl<'a> PayloadDeconstructor<'a> {
let downcast = err.downcast::<minicbor::decode::Error>(); let downcast = err.downcast::<minicbor::decode::Error>();
match downcast { match downcast {
Ok(err) => match err.deref() { Ok(err) => match err.deref().is_end_of_input() {
minicbor::decode::Error::EndOfInput => { true => {
debug!("payload incomplete, fetching next segment"); debug!("payload incomplete, fetching next segment");
let payload = self.rx.recv()?; let payload = self.rx.recv()?;
self.remaining.extend(payload); self.remaining.extend(payload);

4
pallas-primitives/Cargo.toml
View file

@ -14,8 +14,8 @@ authors = [
] ]
[dependencies] [dependencies]
minicbor = { version = "0.13", features = ["std", "half"] } minicbor = { version = "0.14", features = ["std", "half"] }
minicbor-derive = "0.8.0" minicbor-derive = "0.9.0"
hex = "0.4.3" hex = "0.4.3"
log = "0.4.14" log = "0.4.14"
pallas-crypto = { version = "0.5.0", path = "../pallas-crypto" } pallas-crypto = { version = "0.5.0", path = "../pallas-crypto" }

30
pallas-primitives/src/alonzo/model.rs
View file

@ -131,7 +131,7 @@ impl<'b> minicbor::decode::Decode<'b> for Value {
let multiasset = d.decode()?; let multiasset = d.decode()?;
Ok(Value::Multiasset(coin, multiasset)) Ok(Value::Multiasset(coin, multiasset))
} }
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"unknown cbor data type for Alonzo Value enum", "unknown cbor data type for Alonzo Value enum",
)), )),
} }
@ -197,7 +197,7 @@ impl<'b> minicbor::decode::Decode<'b> for InstantaneousRewardSource {
match variant { match variant {
0 => Ok(Self::Reserves), 0 => Ok(Self::Reserves),
1 => Ok(Self::Treasury), 1 => Ok(Self::Treasury),
_ => Err(minicbor::decode::Error::Message("invalid funds variant")), _ => Err(minicbor::decode::Error::message("invalid funds variant")),
} }
} }
} }
@ -292,7 +292,7 @@ impl<'b> minicbor::decode::Decode<'b> for Relay {
0 => Ok(Relay::SingleHostAddr(d.decode()?, d.decode()?, d.decode()?)), 0 => Ok(Relay::SingleHostAddr(d.decode()?, d.decode()?, d.decode()?)),
1 => Ok(Relay::SingleHostName(d.decode()?, d.decode()?)), 1 => Ok(Relay::SingleHostName(d.decode()?, d.decode()?)),
2 => Ok(Relay::MultiHostName(d.decode()?)), 2 => Ok(Relay::MultiHostName(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"invalid variant id for Relay", "invalid variant id for Relay",
)), )),
} }
@ -398,7 +398,7 @@ impl<'b> minicbor::decode::Decode<'b> for StakeCredential {
match variant { match variant {
0 => Ok(StakeCredential::AddrKeyhash(d.decode()?)), 0 => Ok(StakeCredential::AddrKeyhash(d.decode()?)),
1 => Ok(StakeCredential::Scripthash(d.decode()?)), 1 => Ok(StakeCredential::Scripthash(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"invalid variant id for StakeCredential", "invalid variant id for StakeCredential",
)), )),
} }
@ -507,7 +507,7 @@ impl<'b> minicbor::decode::Decode<'b> for Certificate {
let a = d.decode()?; let a = d.decode()?;
Ok(Certificate::MoveInstantaneousRewardsCert(a)) Ok(Certificate::MoveInstantaneousRewardsCert(a))
} }
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"unknown variant id for certificate", "unknown variant id for certificate",
)), )),
} }
@ -716,7 +716,7 @@ impl<'b> minicbor::decode::Decode<'b> for TransactionBodyComponent {
13 => Ok(Self::Collateral(d.decode()?)), 13 => Ok(Self::Collateral(d.decode()?)),
14 => Ok(Self::RequiredSigners(d.decode()?)), 14 => Ok(Self::RequiredSigners(d.decode()?)),
15 => Ok(Self::NetworkId(d.decode()?)), 15 => Ok(Self::NetworkId(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"invalid map key for transaction body component", "invalid map key for transaction body component",
)), )),
} }
@ -859,7 +859,7 @@ impl<'b> minicbor::decode::Decode<'b> for NativeScript {
3 => Ok(NativeScript::ScriptNOfK(d.decode()?, d.decode()?)), 3 => Ok(NativeScript::ScriptNOfK(d.decode()?, d.decode()?)),
4 => Ok(NativeScript::InvalidBefore(d.decode()?)), 4 => Ok(NativeScript::InvalidBefore(d.decode()?)),
5 => Ok(NativeScript::InvalidHereafter(d.decode()?)), 5 => Ok(NativeScript::InvalidHereafter(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"unknown variant id for native script", "unknown variant id for native script",
)), )),
} }
@ -939,12 +939,12 @@ impl<'b> minicbor::decode::Decode<'b> for BigInt {
match tag { match tag {
minicbor::data::Tag::PosBignum => Ok(Self::BigUInt(d.decode()?)), minicbor::data::Tag::PosBignum => Ok(Self::BigUInt(d.decode()?)),
minicbor::data::Tag::NegBignum => Ok(Self::BigNInt(d.decode()?)), minicbor::data::Tag::NegBignum => Ok(Self::BigNInt(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"invalid cbor tag for big int", "invalid cbor tag for big int",
)), )),
} }
} }
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"invalid cbor data type for big int", "invalid cbor data type for big int",
)), )),
} }
@ -996,7 +996,7 @@ impl<'b> minicbor::decode::Decode<'b> for PlutusData {
match tag { match tag {
Tag::Unassigned(121..=127 | 1280..=1400 | 102) => Ok(Self::Constr(d.decode()?)), Tag::Unassigned(121..=127 | 1280..=1400 | 102) => Ok(Self::Constr(d.decode()?)),
Tag::PosBignum | Tag::NegBignum => Ok(Self::BigInt(d.decode()?)), Tag::PosBignum | Tag::NegBignum => Ok(Self::BigInt(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"unknown tag for plutus data tag", "unknown tag for plutus data tag",
)), )),
} }
@ -1015,7 +1015,7 @@ impl<'b> minicbor::decode::Decode<'b> for PlutusData {
minicbor::data::Type::Array => Ok(Self::Array(d.decode()?)), minicbor::data::Type::Array => Ok(Self::Array(d.decode()?)),
minicbor::data::Type::ArrayIndef => Ok(Self::ArrayIndef(d.decode()?)), minicbor::data::Type::ArrayIndef => Ok(Self::ArrayIndef(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"bad cbor data type for plutus data", "bad cbor data type for plutus data",
)), )),
} }
@ -1083,11 +1083,11 @@ where
values, values,
}) })
} }
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"bad tag code for plutus data", "bad tag code for plutus data",
)), )),
}, },
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"bad tag code for plutus data", "bad tag code for plutus data",
)), )),
} }
@ -1269,7 +1269,7 @@ impl<'b> minicbor::Decode<'b> for Metadatum {
minicbor::data::Type::String => Ok(Metadatum::Text(d.decode()?)), minicbor::data::Type::String => Ok(Metadatum::Text(d.decode()?)),
minicbor::data::Type::Array => Ok(Metadatum::Array(d.decode()?)), minicbor::data::Type::Array => Ok(Metadatum::Array(d.decode()?)),
minicbor::data::Type::Map => Ok(Metadatum::Map(d.decode()?)), minicbor::data::Type::Map => Ok(Metadatum::Map(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"Can't turn data type into metadatum", "Can't turn data type into metadatum",
)), )),
} }
@ -1332,7 +1332,7 @@ impl<'b> minicbor::Decode<'b> for AuxiliaryData {
d.tag()?; d.tag()?;
Ok(AuxiliaryData::Alonzo(d.decode()?)) Ok(AuxiliaryData::Alonzo(d.decode()?))
} }
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"Can't infer variant from data type for AuxiliaryData", "Can't infer variant from data type for AuxiliaryData",
)), )),
} }

12
pallas-primitives/src/byron/model.rs
View file

@ -63,7 +63,7 @@ impl<'b> minicbor::Decode<'b> for AddrDistr {
match variant { match variant {
0 => Ok(AddrDistr::Variant0(d.decode()?)), 0 => Ok(AddrDistr::Variant0(d.decode()?)),
1 => Ok(AddrDistr::Variant1), 1 => Ok(AddrDistr::Variant1),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"invalid variant for addrdstr", "invalid variant for addrdstr",
)), )),
} }
@ -143,7 +143,7 @@ impl<'b> minicbor::Decode<'b> for AddrAttrProperty {
match key { match key {
0 => Ok(AddrAttrProperty::AddrDistr(d.decode()?)), 0 => Ok(AddrAttrProperty::AddrDistr(d.decode()?)),
1 => Ok(AddrAttrProperty::Bytes(d.decode()?)), 1 => Ok(AddrAttrProperty::Bytes(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"unknown variant for addrattr property", "unknown variant for addrattr property",
)), )),
} }
@ -411,7 +411,7 @@ impl<'b> minicbor::Decode<'b> for Ssc {
1 => Ok(Ssc::Variant1(d.decode()?, d.decode()?)), 1 => Ok(Ssc::Variant1(d.decode()?, d.decode()?)),
2 => Ok(Ssc::Variant2(d.decode()?, d.decode()?)), 2 => Ok(Ssc::Variant2(d.decode()?, d.decode()?)),
3 => Ok(Ssc::Variant3(d.decode()?)), 3 => Ok(Ssc::Variant3(d.decode()?)),
_ => Err(minicbor::decode::Error::Message("invalid variant for ssc")), _ => Err(minicbor::decode::Error::message("invalid variant for ssc")),
} }
} }
} }
@ -476,7 +476,7 @@ impl<'b> minicbor::Decode<'b> for SscProof {
1 => Ok(SscProof::Variant1(d.decode()?, d.decode()?)), 1 => Ok(SscProof::Variant1(d.decode()?, d.decode()?)),
2 => Ok(SscProof::Variant2(d.decode()?, d.decode()?)), 2 => Ok(SscProof::Variant2(d.decode()?, d.decode()?)),
3 => Ok(SscProof::Variant3(d.decode()?)), 3 => Ok(SscProof::Variant3(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"invalid variant for sscproof", "invalid variant for sscproof",
)), )),
} }
@ -728,7 +728,7 @@ impl<'b> minicbor::Decode<'b> for BlockSig {
0 => Ok(BlockSig::Signature(d.decode()?)), 0 => Ok(BlockSig::Signature(d.decode()?)),
1 => Ok(BlockSig::LwdlgSig(d.decode()?)), 1 => Ok(BlockSig::LwdlgSig(d.decode()?)),
2 => Ok(BlockSig::DlgSig(d.decode()?)), 2 => Ok(BlockSig::DlgSig(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"unknown variant for blocksig", "unknown variant for blocksig",
)), )),
} }
@ -916,7 +916,7 @@ impl<'b> minicbor::Decode<'b> for Block {
match variant { match variant {
0 => Ok(Block::EbBlock(d.decode()?)), 0 => Ok(Block::EbBlock(d.decode()?)),
1 => Ok(Block::MainBlock(d.decode()?)), 1 => Ok(Block::MainBlock(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"unknown variant for block", "unknown variant for block",
)), )),
} }

10
pallas-primitives/src/utils.rs
View file

@ -65,7 +65,7 @@ where
match datatype { match datatype {
minicbor::data::Type::Map => Ok(KeyValuePairs::Def(items)), minicbor::data::Type::Map => Ok(KeyValuePairs::Def(items)),
minicbor::data::Type::MapIndef => Ok(KeyValuePairs::Indef(items)), minicbor::data::Type::MapIndef => Ok(KeyValuePairs::Indef(items)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"invalid data type for keyvaluepairs", "invalid data type for keyvaluepairs",
)), )),
} }
@ -134,7 +134,7 @@ where
match datatype { match datatype {
minicbor::data::Type::Array => Ok(Self::Def(d.decode()?)), minicbor::data::Type::Array => Ok(Self::Def(d.decode()?)),
minicbor::data::Type::ArrayIndef => Ok(Self::Indef(d.decode()?)), minicbor::data::Type::ArrayIndef => Ok(Self::Indef(d.decode()?)),
_ => Err(minicbor::decode::Error::Message( _ => Err(minicbor::decode::Error::message(
"unknown data type of maybe indef array", "unknown data type of maybe indef array",
)), )),
} }
@ -248,7 +248,7 @@ where
e: &mut minicbor::Encoder<W>, e: &mut minicbor::Encoder<W>,
) -> Result<(), minicbor::encode::Error<W::Error>> { ) -> Result<(), minicbor::encode::Error<W::Error>> {
let buf = minicbor::to_vec(&self.0).map_err(|_| { let buf = minicbor::to_vec(&self.0).map_err(|_| {
minicbor::encode::Error::Message("error encoding cbor-wrapped structure") minicbor::encode::Error::message("error encoding cbor-wrapped structure")
})?; })?;
e.tag(Tag::Cbor)?; e.tag(Tag::Cbor)?;
@ -345,10 +345,10 @@ where
match len { match len {
Some(0) => Ok(ZeroOrOneArray(None)), Some(0) => Ok(ZeroOrOneArray(None)),
Some(1) => Ok(ZeroOrOneArray(Some(d.decode()?))), Some(1) => Ok(ZeroOrOneArray(Some(d.decode()?))),
Some(_) => Err(minicbor::decode::Error::Message( Some(_) => Err(minicbor::decode::Error::message(
"found invalid len for zero-or-one pattern", "found invalid len for zero-or-one pattern",
)), )),
None => Err(minicbor::decode::Error::Message( None => Err(minicbor::decode::Error::message(
"found invalid indefinite len array for zero-or-one pattern", "found invalid indefinite len array for zero-or-one pattern",
)), )),
} }