Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Expose (necessary) hidden struct fields #501

Merged
merged 2 commits into from
Aug 10, 2024
Merged

Expose (necessary) hidden struct fields #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57f108e
Provide slightly better error when failing to decode Plutus data.
KtorZ Aug 10, 2024
7e5c906
Expose GovActionId, Constitution & Anchor inner fields
KtorZ Aug 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pallas-primitives/src/alonzo/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,9 +1057,9 @@ impl<'b, C> minicbor::decode::Decode<'b, C> for PlutusData {
Ok(Self::Array(d.decode_with(ctx)?))
}

_ => Err(minicbor::decode::Error::message(
"bad cbor data type for plutus data",
)),
any => Err(minicbor::decode::Error::message(format!(
"bad cbor data type ({any:?}) for plutus data"
))),
}
}
}
Expand Down
42 changes: 30 additions & 12 deletions pallas-primitives/src/conway/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,13 +1032,19 @@ impl<C> minicbor::encode::Encode<C> for GovAction {
}

#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
pub struct Constitution(Anchor, Nullable<ScriptHash>);
pub struct Constitution {
pub anchor: Anchor,
pub guardrail_script: Nullable<ScriptHash>,
}

impl<'b, C> minicbor::Decode<'b, C> for Constitution {
fn decode(d: &mut minicbor::Decoder<'b>, ctx: &mut C) -> Result<Self, minicbor::decode::Error> {
d.array()?;

Ok(Self(d.decode_with(ctx)?, d.decode_with(ctx)?))
Ok(Self {
anchor: d.decode_with(ctx)?,
guardrail_script: d.decode_with(ctx)?,
})
}
}

Expand All @@ -1050,8 +1056,8 @@ impl<C> minicbor::Encode<C> for Constitution {
) -> Result<(), minicbor::encode::Error<W::Error>> {
e.array(2)?;

e.encode_with(&self.0, ctx)?;
e.encode_with(&self.1, ctx)?;
e.encode_with(&self.anchor, ctx)?;
e.encode_with(&self.guardrail_script, ctx)?;

Ok(())
}
Expand Down Expand Up @@ -1128,13 +1134,19 @@ impl<C> minicbor::encode::Encode<C> for Voter {
}

#[derive(Serialize, Deserialize, Debug, PartialEq, PartialOrd, Eq, Ord, Clone)]
pub struct Anchor(String, Hash<32>);
pub struct Anchor {
pub url: String,
pub content_hash: Hash<32>,
}

impl<'b, C> minicbor::Decode<'b, C> for Anchor {
fn decode(d: &mut minicbor::Decoder<'b>, ctx: &mut C) -> Result<Self, minicbor::decode::Error> {
d.array()?;

Ok(Self(d.decode_with(ctx)?, d.decode_with(ctx)?))
Ok(Self {
url: d.decode_with(ctx)?,
content_hash: d.decode_with(ctx)?,
})
}
}

Expand All @@ -1146,21 +1158,27 @@ impl<C> minicbor::Encode<C> for Anchor {
) -> Result<(), minicbor::encode::Error<W::Error>> {
e.array(2)?;

e.encode_with(&self.0, ctx)?;
e.encode_with(self.1, ctx)?;
e.encode_with(&self.url, ctx)?;
e.encode_with(self.content_hash, ctx)?;

Ok(())
}
}

#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
pub struct GovActionId(Hash<32>, u32);
pub struct GovActionId {
pub transaction_id: Hash<32>,
pub action_index: u32,
}

impl<'b, C> minicbor::Decode<'b, C> for GovActionId {
fn decode(d: &mut minicbor::Decoder<'b>, ctx: &mut C) -> Result<Self, minicbor::decode::Error> {
d.array()?;

Ok(Self(d.decode_with(ctx)?, d.decode_with(ctx)?))
Ok(Self {
transaction_id: d.decode_with(ctx)?,
action_index: d.decode_with(ctx)?,
})
}
}

Expand All @@ -1172,8 +1190,8 @@ impl<C> minicbor::Encode<C> for GovActionId {
) -> Result<(), minicbor::encode::Error<W::Error>> {
e.array(2)?;

e.encode_with(self.0, ctx)?;
e.encode_with(self.1, ctx)?;
e.encode_with(self.transaction_id, ctx)?;
e.encode_with(self.action_index, ctx)?;

Ok(())
}
Expand Down