diff --git a/pallas-primitives/src/alonzo/address.rs b/pallas-primitives/src/alonzo/address.rs index 8f93a3af..59a6bb6d 100644 --- a/pallas-primitives/src/alonzo/address.rs +++ b/pallas-primitives/src/alonzo/address.rs @@ -36,7 +36,7 @@ mod tests { fn known_address_matches() { // TODO: expand this test to include more test blocks let block_idx = 1; - let block_str = include_str!("test_data/test2.block"); + let block_str = include_str!("../test_data/alonzo2.block"); let block_bytes = hex::decode(block_str).expect(&format!("bad block file {}", block_idx)); let BlockWrapper(_, block) = BlockWrapper::decode_fragment(&block_bytes[..]) diff --git a/pallas-primitives/src/alonzo/crypto.rs b/pallas-primitives/src/alonzo/crypto.rs index 5ba1785a..39623454 100644 --- a/pallas-primitives/src/alonzo/crypto.rs +++ b/pallas-primitives/src/alonzo/crypto.rs @@ -61,7 +61,7 @@ mod tests { fn transaction_hash_works() { // TODO: expand this test to include more test blocks let block_idx = 1; - let block_str = include_str!("test_data/test1.block"); + let block_str = include_str!("../test_data/alonzo1.block"); let block_bytes = hex::decode(block_str).expect(&format!("bad block file {}", block_idx)); let block_model = BlockWrapper::decode_fragment(&block_bytes[..]) diff --git a/pallas-primitives/src/alonzo/json.rs b/pallas-primitives/src/alonzo/json.rs index 4139037e..82d7100a 100644 --- a/pallas-primitives/src/alonzo/json.rs +++ b/pallas-primitives/src/alonzo/json.rs @@ -85,8 +85,8 @@ mod tests { #[test] fn test_datums_serialize_as_expected() { let test_blocks = vec![( - include_str!("test_data/test9.block"), - include_str!("test_data/test9.datums"), + include_str!("../test_data/alonzo9.block"), + include_str!("../test_data/alonzo9.datums"), )]; for (idx, (block_str, jsonl_str)) in test_blocks.iter().enumerate() { @@ -115,8 +115,8 @@ mod tests { #[test] fn test_native_scripts_serialize_as_expected() { let test_blocks = vec![( - include_str!("test_data/test9.block"), - include_str!("test_data/test9.native"), + include_str!("../test_data/alonzo9.block"), + include_str!("../test_data/alonzo9.native"), )]; for (idx, (block_str, jsonl_str)) in test_blocks.iter().enumerate() { diff --git a/pallas-primitives/src/alonzo/model.rs b/pallas-primitives/src/alonzo/model.rs index 019f6f19..c249b262 100644 --- a/pallas-primitives/src/alonzo/model.rs +++ b/pallas-primitives/src/alonzo/model.rs @@ -1459,45 +1459,45 @@ mod tests { #[test] fn block_isomorphic_decoding_encoding() { let test_blocks = vec![ - include_str!("test_data/test1.block"), - include_str!("test_data/test2.block"), - include_str!("test_data/test3.block"), - include_str!("test_data/test4.block"), - include_str!("test_data/test5.block"), - include_str!("test_data/test6.block"), - include_str!("test_data/test7.block"), - include_str!("test_data/test8.block"), - include_str!("test_data/test9.block"), + include_str!("../test_data/alonzo1.block"), + include_str!("../test_data/alonzo2.block"), + include_str!("../test_data/alonzo3.block"), + include_str!("../test_data/alonzo4.block"), + include_str!("../test_data/alonzo5.block"), + include_str!("../test_data/alonzo6.block"), + include_str!("../test_data/alonzo7.block"), + include_str!("../test_data/alonzo8.block"), + include_str!("../test_data/alonzo9.block"), // old block without invalid_transactions fields - include_str!("test_data/test10.block"), + include_str!("../test_data/alonzo10.block"), // peculiar block with protocol update params - include_str!("test_data/test11.block"), + include_str!("../test_data/alonzo11.block"), // peculiar block with decoding issue // https://github.com/txpipe/oura/issues/37 - include_str!("test_data/test12.block"), + include_str!("../test_data/alonzo12.block"), // peculiar block with protocol update params, including nonce - include_str!("test_data/test13.block"), + include_str!("../test_data/alonzo13.block"), // peculiar block with overflow crash // https://github.com/txpipe/oura/issues/113 - include_str!("test_data/test14.block"), + include_str!("../test_data/alonzo14.block"), // peculiar block with many move-instantaneous-rewards certs - include_str!("test_data/test15.block"), + include_str!("../test_data/alonzo15.block"), // peculiar block with protocol update values - include_str!("test_data/test16.block"), + include_str!("../test_data/alonzo16.block"), // peculiar block with missing nonce hash - include_str!("test_data/test17.block"), + include_str!("../test_data/alonzo17.block"), // peculiar block with strange AuxiliaryData variant - include_str!("test_data/test18.block"), + include_str!("../test_data/alonzo18.block"), // peculiar block with strange AuxiliaryData variant - include_str!("test_data/test18.block"), + include_str!("../test_data/alonzo18.block"), // peculiar block with nevative i64 overflow - include_str!("test_data/test19.block"), + include_str!("../test_data/alonzo19.block"), // peculiar block with very BigInt in plutus code - include_str!("test_data/test20.block"), + include_str!("../test_data/alonzo20.block"), // peculiar block with bad tx hash - include_str!("test_data/test21.block"), + include_str!("../test_data/alonzo21.block"), // peculiar block with bad tx hash - include_str!("test_data/test22.block"), + include_str!("../test_data/alonzo22.block"), ]; for (idx, block_str) in test_blocks.iter().enumerate() { diff --git a/pallas-primitives/src/probing.rs b/pallas-primitives/src/probing.rs index 423ba214..39b8b529 100644 --- a/pallas-primitives/src/probing.rs +++ b/pallas-primitives/src/probing.rs @@ -91,7 +91,7 @@ mod tests { #[test] fn alonzo_block_detected() { - let block_str = include_str!("alonzo/test_data/test1.block"); + let block_str = include_str!("test_data/alonzo1.block"); let bytes = hex::decode(block_str).unwrap(); let inference = probe_block_cbor_era(bytes.as_slice()); diff --git a/pallas-primitives/src/alonzo/test_data/test1.block b/pallas-primitives/src/test_data/alonzo1.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test1.block rename to pallas-primitives/src/test_data/alonzo1.block diff --git a/pallas-primitives/src/alonzo/test_data/test10.block b/pallas-primitives/src/test_data/alonzo10.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test10.block rename to pallas-primitives/src/test_data/alonzo10.block diff --git a/pallas-primitives/src/alonzo/test_data/test11.block b/pallas-primitives/src/test_data/alonzo11.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test11.block rename to pallas-primitives/src/test_data/alonzo11.block diff --git a/pallas-primitives/src/alonzo/test_data/test12.block b/pallas-primitives/src/test_data/alonzo12.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test12.block rename to pallas-primitives/src/test_data/alonzo12.block diff --git a/pallas-primitives/src/alonzo/test_data/test13.block b/pallas-primitives/src/test_data/alonzo13.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test13.block rename to pallas-primitives/src/test_data/alonzo13.block diff --git a/pallas-primitives/src/alonzo/test_data/test14.block b/pallas-primitives/src/test_data/alonzo14.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test14.block rename to pallas-primitives/src/test_data/alonzo14.block diff --git a/pallas-primitives/src/alonzo/test_data/test15.block b/pallas-primitives/src/test_data/alonzo15.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test15.block rename to pallas-primitives/src/test_data/alonzo15.block diff --git a/pallas-primitives/src/alonzo/test_data/test16.block b/pallas-primitives/src/test_data/alonzo16.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test16.block rename to pallas-primitives/src/test_data/alonzo16.block diff --git a/pallas-primitives/src/alonzo/test_data/test17.block b/pallas-primitives/src/test_data/alonzo17.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test17.block rename to pallas-primitives/src/test_data/alonzo17.block diff --git a/pallas-primitives/src/alonzo/test_data/test18.block b/pallas-primitives/src/test_data/alonzo18.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test18.block rename to pallas-primitives/src/test_data/alonzo18.block diff --git a/pallas-primitives/src/alonzo/test_data/test19.block b/pallas-primitives/src/test_data/alonzo19.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test19.block rename to pallas-primitives/src/test_data/alonzo19.block diff --git a/pallas-primitives/src/alonzo/test_data/test2.block b/pallas-primitives/src/test_data/alonzo2.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test2.block rename to pallas-primitives/src/test_data/alonzo2.block diff --git a/pallas-primitives/src/alonzo/test_data/test20.block b/pallas-primitives/src/test_data/alonzo20.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test20.block rename to pallas-primitives/src/test_data/alonzo20.block diff --git a/pallas-primitives/src/alonzo/test_data/test21.block b/pallas-primitives/src/test_data/alonzo21.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test21.block rename to pallas-primitives/src/test_data/alonzo21.block diff --git a/pallas-primitives/src/alonzo/test_data/test22.block b/pallas-primitives/src/test_data/alonzo22.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test22.block rename to pallas-primitives/src/test_data/alonzo22.block diff --git a/pallas-primitives/src/alonzo/test_data/test3.block b/pallas-primitives/src/test_data/alonzo3.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test3.block rename to pallas-primitives/src/test_data/alonzo3.block diff --git a/pallas-primitives/src/alonzo/test_data/test4.block b/pallas-primitives/src/test_data/alonzo4.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test4.block rename to pallas-primitives/src/test_data/alonzo4.block diff --git a/pallas-primitives/src/alonzo/test_data/test5.block b/pallas-primitives/src/test_data/alonzo5.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test5.block rename to pallas-primitives/src/test_data/alonzo5.block diff --git a/pallas-primitives/src/alonzo/test_data/test6.block b/pallas-primitives/src/test_data/alonzo6.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test6.block rename to pallas-primitives/src/test_data/alonzo6.block diff --git a/pallas-primitives/src/alonzo/test_data/test7.block b/pallas-primitives/src/test_data/alonzo7.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test7.block rename to pallas-primitives/src/test_data/alonzo7.block diff --git a/pallas-primitives/src/alonzo/test_data/test8.block b/pallas-primitives/src/test_data/alonzo8.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test8.block rename to pallas-primitives/src/test_data/alonzo8.block diff --git a/pallas-primitives/src/alonzo/test_data/test9.block b/pallas-primitives/src/test_data/alonzo9.block similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test9.block rename to pallas-primitives/src/test_data/alonzo9.block diff --git a/pallas-primitives/src/alonzo/test_data/test9.datums b/pallas-primitives/src/test_data/alonzo9.datums similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test9.datums rename to pallas-primitives/src/test_data/alonzo9.datums diff --git a/pallas-primitives/src/alonzo/test_data/test9.native b/pallas-primitives/src/test_data/alonzo9.native similarity index 100% rename from pallas-primitives/src/alonzo/test_data/test9.native rename to pallas-primitives/src/test_data/alonzo9.native