Skip to content

Commit

Permalink
fix: back-merge v0.18.1 hotfix (#254)
Browse files Browse the repository at this point in the history
  • Loading branch information
scarmuega authored Apr 28, 2023
1 parent afb2d6a commit c9119e4
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
2 changes: 2 additions & 0 deletions pallas-primitives/src/alonzo/model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ pub enum Value {
impl<'b, C> minicbor::decode::Decode<'b, C> for Value {
fn decode(d: &mut minicbor::Decoder<'b>, ctx: &mut C) -> Result<Self, minicbor::decode::Error> {
match d.datatype()? {
minicbor::data::Type::U8 => Ok(Value::Coin(d.decode_with(ctx)?)),
minicbor::data::Type::U16 => Ok(Value::Coin(d.decode_with(ctx)?)),
minicbor::data::Type::U32 => Ok(Value::Coin(d.decode_with(ctx)?)),
minicbor::data::Type::U64 => Ok(Value::Coin(d.decode_with(ctx)?)),
minicbor::data::Type::Array => {
Expand Down
15 changes: 14 additions & 1 deletion pallas-primitives/src/babbage/model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,8 @@ impl<'b> From<MintedTx<'b>> for Tx {
mod tests {
use pallas_codec::minicbor;

use super::MintedBlock;
use super::{MintedBlock, TransactionOutput};
use crate::Fragment;

type BlockWrapper<'b> = (u16, MintedBlock<'b>);

Expand Down Expand Up @@ -775,4 +776,16 @@ mod tests {
assert!(bytes.eq(&bytes2), "re-encoded bytes didn't match original");
}
}

#[test]
fn fragments_decoding() {
// peculiar array of outputs used in an hydra transaction
let hex = include_str!("../../../test_data/babbage1.fr");
let bytes = hex::decode(hex).unwrap();
let outputs = Vec::<TransactionOutput>::decode_fragment(&bytes).unwrap();

dbg!(outputs);

// add any loose fragment tests here
}
}
1 change: 1 addition & 0 deletions test_data/babbage1.fr
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
95a300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f58208e1c4232d4206dea0591772f1cc47548504d84cac258ee31176977abeca83fdb1a007ed75b1a094fbd981a002e6bde00ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f582015a09b780e7a213d465f525e26d281fe771fb3dcd3c1a83ffd1554150438e29d1a007087741a1506cd001a004fa2d502ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f5820f1360c66060cda107bfba609d8832881c87d3a37071c67a8abd76fdb1760271a1a0032e4411a03c174dd1a0046fcb702ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f5820535868db5f813f9ad586fd48f5ce08d8fc129863038cfe67632316a9e86e70871a009142ec1a01302e331a0018099b02ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f582098dcd4c69c6ae24d052533a7b63beac92e116423069cf00fa59dbf202ac208431a004747bd1a01302e331a000923a301ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f58209c2647cbe94711507730415a7cea56492cbcd2c58e0a76be4984eb316ec804cc1a005810921a1739aead1a0010697901ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f5820c7ddd08205063957e3cee3966e47dc4dc69201a14e57c422778f043558150c9e1a0054c4261a0eca615d1a0053eff001ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f5820d6e992841b6883b58834b1a15d0151c71fa27f24845c3e945b477843a0a6df441a00475f911a04d578671a0018ba3601ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f58200eb0a3010135b52dfa7c1be925b41ae78f98f730c694ee417bf22fc4381bb1e61a008e9ffc1a0eca615d1a002c7ac201ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f58208e1c4232d4206dea0591772f1cc47548504d84cac258ee31176977abeca83fdb1a007ed75b1a1506cd001a0035648200ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f5820c1a46520f70be4a210fe817e7f1e956ae90534dbc573bb068abad4007c4cc36b1a0091ced61a01302e331a005abde100ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f582046a348a93694561410fda071dd99d4bb13d2657782821d980a438769bc9e540c1a0094b10c1a010ab5111a0002b85200ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f58201f161aa9ec7b342c6c8b3f34361149274f2ecca885537185f3c9aa32c00b50f21a005bf2c21a0389bb441a0026214002ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f5820c7ddd08205063957e3cee3966e47dc4dc69201a14e57c422778f043558150c9e1a0054c4261a0389bb441a001c489901ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f58204534688ea53b66066a40da1b6737ede6698344b8bc01355590e1d98aaeba5d711a0072f3181a1739aead1a003a697d00ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f5820231ba0316f01460fe2ee838823b96d012a5d1c1954860d61a96d02d9f48ab2ab1a0010acee1a1739aead1a0028d2d501ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f5820a8618ccc0179defe3e65fe958d860adcf96ca6b05d0cc854f1b7d10f617d64cb1a0086bcb11a0eca615d1a000ed4e500ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f582050f0a2cd34228e558acea6aa8a6a0d88a9eb1ce249cd5dda29758d782402f10e1a002b6a891a010ab5111a0037af8d02ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f5820eb2e7f4200177c7970be21c00df5c36c3fc4ebc859c8cb7409eeacc835e268bf1a004fea911a03c174dd1a0013c2fc02ffa300581d70080a80487a282e59597f49c1cafa2ab0bce31dfe523e599694dfb94e0100028201d8185836d8799f5820506f89b7afa5b6b1b5fee97ef3d961b37dbf7ad783d40c1e3f73470541d5df5a1a0023c4e41a0eca615d1a00143c1b02ff82581d60f8a68cd18e59a6ace848155a0e967af64f4d00cf8acee8adc95a6b0d1b0000001748756d4b

0 comments on commit c9119e4

Please sign in to comment.