Skip to content

Commit 3e64281

Browse files
chfanghrchfanghr
committed
move plutus-data back to where it was
1 parent b4351b7 commit 3e64281

File tree

15 files changed

+635
-74
lines changed

15 files changed

+635
-74
lines changed

‎is-plutus-data-derive/src/derive_impl.rs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ pub(crate) fn get_is_plutus_data_instance(input: DeriveInput) -> Result<ItemImpl
3232
let (impl_generics, type_generics, where_clause) = generics.split_for_impl();
3333

3434
Ok(parse_quote!(
35-
impl #impl_generics plutus_data::IsPlutusData for #type_name #type_generics #where_clause {
36-
fn to_plutus_data(&self) -> plutus_data::PlutusData {
35+
impl #impl_generics plutus_ledger_api::plutus_data::IsPlutusData for #type_name #type_generics #where_clause {
36+
fn to_plutus_data(&self) -> plutus_ledger_api::plutus_data::PlutusData {
3737
#encoder
3838
}
3939

40-
fn from_plutus_data(plutus_data: &plutus_data::PlutusData) -> Result<Self, plutus_data::PlutusDataError>
40+
fn from_plutus_data(plutus_data: &plutus_ledger_api::plutus_data::PlutusData) -> Result<Self, plutus_ledger_api::plutus_data::PlutusDataError>
4141
where Self: Sized {
4242
#decoder
4343
}
@@ -170,15 +170,15 @@ fn get_newtype_encoder_decoder(input: &DeriveInput) -> Result<(Block, Block)> {
170170
Some(field_name) => {
171171
parse_quote!({
172172
Ok(Self {
173-
#field_name: plutus_data::IsPlutusData::from_plutus_data(plutus_data)?
173+
#field_name: plutus_ledger_api::plutus_data::IsPlutusData::from_plutus_data(plutus_data)?
174174
})
175175
})
176176
}
177177
None => {
178178
parse_quote!({
179-
Ok(Self(plutus_data::IsPlutusData::from_plutus_data(
180-
plutus_data,
181-
)?))
179+
Ok(Self(
180+
plutus_ledger_api::plutus_data::IsPlutusData::from_plutus_data(plutus_data)?,
181+
))
182182
})
183183
}
184184
};
@@ -310,11 +310,11 @@ fn enum_from_plutus_data_constr(e: &DataEnum, plutus_data_input_var: &Ident) ->
310310

311311
parse_quote!(
312312
{
313-
let (tag, #plutus_data_list_var) = plutus_data::is_plutus_data::aux::parse_constr(#plutus_data_input_var)?;
313+
let (tag, #plutus_data_list_var) = plutus_ledger_api::plutus_data::parse_constr(#plutus_data_input_var)?;
314314

315315
match tag {
316316
#(#arms),*
317-
tag => Err(plutus_data::PlutusDataError::UnexpectedPlutusInvariant {
317+
tag => Err(plutus_ledger_api::plutus_data::PlutusDataError::UnexpectedPlutusInvariant {
318318
wanted: format!(#expected_tags_str),
319319
got: tag.to_string(),
320320
}),
@@ -380,7 +380,7 @@ fn variant_with_named_fields_to_plutus_data(
380380
let plutus_data_list = data_fields_to_list_of_plutus_data(&field_accessors);
381381

382382
parse_quote!(
383-
#constructor{ #(#field_names),* } => plutus_data::PlutusData::Constr(#tag.into(), #plutus_data_list)
383+
#constructor{ #(#field_names),* } => plutus_ledger_api::plutus_data::PlutusData::Constr(#tag.into(), #plutus_data_list)
384384
)
385385
}
386386

@@ -407,7 +407,7 @@ fn variant_with_unnamed_field_to_plutus_data(
407407
let plutus_data_list = data_fields_to_list_of_plutus_data(&field_accessors);
408408

409409
parse_quote!(
410-
#constructor(#(#field_names),*) => plutus_data::PlutusData::Constr(#tag.into(), #plutus_data_list)
410+
#constructor(#(#field_names),*) => plutus_ledger_api::plutus_data::PlutusData::Constr(#tag.into(), #plutus_data_list)
411411
)
412412
}
413413

@@ -425,7 +425,7 @@ fn variant_with_unnamed_fields_from_plutus_data_list(
425425

426426
fn variant_with_no_field_to_plutus_data(constructor: &Path, tag: usize) -> Arm {
427427
parse_quote!(
428-
#constructor => plutus_data::PlutusData::Constr(#tag.into(), vec![])
428+
#constructor => plutus_ledger_api::plutus_data::PlutusData::Constr(#tag.into(), vec![])
429429
)
430430
}
431431

@@ -463,7 +463,7 @@ fn struct_with_named_fields_to_plutus_data_list(fields: &FieldsNamed) -> Block {
463463
let to_list_of_plutus_data = struct_with_named_fields_to_list_of_plutus_data(fields);
464464

465465
parse_quote!({
466-
plutus_data::PlutusData::List(#to_list_of_plutus_data)
466+
plutus_ledger_api::plutus_data::PlutusData::List(#to_list_of_plutus_data)
467467
})
468468
}
469469

@@ -477,7 +477,7 @@ fn struct_with_named_fields_from_plutus_data_list(
477477
struct_with_named_fields_from_list_of_plutus_data(fields, &list_of_plutus_data_var);
478478

479479
parse_quote!({
480-
let #list_of_plutus_data_var = plutus_data::is_plutus_data::aux::parse_list(#plutus_data_input_var)?;
480+
let #list_of_plutus_data_var = plutus_ledger_api::plutus_data::parse_list(#plutus_data_input_var)?;
481481

482482
#from_list_of_plutus_data
483483
})
@@ -487,7 +487,7 @@ fn struct_with_named_fields_to_plutus_data_constr(fields: &FieldsNamed) -> Block
487487
let to_list_of_plutus_data = struct_with_named_fields_to_list_of_plutus_data(fields);
488488

489489
parse_quote!({
490-
plutus_data::PlutusData::Constr(0.into(), #to_list_of_plutus_data)
490+
plutus_ledger_api::plutus_data::PlutusData::Constr(0.into(), #to_list_of_plutus_data)
491491
})
492492
}
493493

@@ -501,7 +501,7 @@ fn struct_with_named_fields_from_plutus_data_constr(
501501
struct_with_named_fields_from_list_of_plutus_data(fields, &plutus_data_list_var);
502502

503503
parse_quote!({
504-
let #plutus_data_list_var = plutus_data::is_plutus_data::aux::parse_constr_with_tag(#plutus_data_input_var, 0)?;
504+
let #plutus_data_list_var = plutus_ledger_api::plutus_data::parse_constr_with_tag(#plutus_data_input_var, 0)?;
505505

506506
#from_plutus_data_list
507507
})
@@ -537,7 +537,7 @@ fn struct_with_unnamed_fields_to_plutus_data_list(fields: &FieldsUnnamed) -> Blo
537537
let to_list_of_plutus_data = struct_with_unnamed_fields_to_list_of_plutus_data(fields);
538538

539539
parse_quote!({
540-
plutus_data::PlutusData::List(#to_list_of_plutus_data)
540+
plutus_ledger_api::plutus_data::PlutusData::List(#to_list_of_plutus_data)
541541
})
542542
}
543543

@@ -551,7 +551,7 @@ fn struct_with_unnamed_fields_from_plutus_data_list(
551551
struct_with_unnamed_fields_from_list_of_plutus_data(fields, &list_of_plutus_data_var);
552552

553553
parse_quote!({
554-
let #list_of_plutus_data_var = plutus_data::is_plutus_data::aux::parse_list(#plutus_data_input_var)?;
554+
let #list_of_plutus_data_var = plutus_ledger_api::plutus_data::parse_list(#plutus_data_input_var)?;
555555

556556
#from_list_of_plutus_data
557557
})
@@ -561,7 +561,7 @@ fn struct_with_unnamed_fields_to_plutus_data_constr(fields: &FieldsUnnamed) -> B
561561
let to_list_of_plutus_data = struct_with_unnamed_fields_to_list_of_plutus_data(fields);
562562

563563
parse_quote!({
564-
plutus_data::PlutusData::Constr(0.into(), #to_list_of_plutus_data)
564+
plutus_ledger_api::plutus_data::PlutusData::Constr(0.into(), #to_list_of_plutus_data)
565565
})
566566
}
567567

@@ -574,7 +574,7 @@ fn struct_with_unnamed_fields_from_plutus_data_constr(
574574
let from_fields = struct_with_unnamed_fields_from_list_of_plutus_data(fields, &fields_var);
575575

576576
parse_quote!({
577-
let #fields_var = plutus_data::is_plutus_data::aux::parse_constr_with_tag(#plutus_data_input_var, 0)?;
577+
let #fields_var = plutus_ledger_api::plutus_data::parse_constr_with_tag(#plutus_data_input_var, 0)?;
578578

579579
#from_fields
580580
})
@@ -591,7 +591,7 @@ fn struct_with_no_field_from_plutus_data_list(plutus_data_input_var: &Ident) ->
591591
data_with_no_fields_from_list_of_plutus_data(&parse_quote!(Self), &list_of_plutus_data_var);
592592

593593
parse_quote!({
594-
let #list_of_plutus_data_var = plutus_data::is_plutus_data::aux::parse_list(#plutus_data_input_var)?;
594+
let #list_of_plutus_data_var = plutus_ledger_api::plutus_data::parse_list(#plutus_data_input_var)?;
595595

596596
#from_list_of_plutus_data
597597
})
@@ -608,7 +608,7 @@ fn struct_with_no_field_from_plutus_data_constr(plutus_data_input_var: &Ident) -
608608
data_with_no_fields_from_list_of_plutus_data(&parse_quote!(Self), &fields_var);
609609

610610
parse_quote!({
611-
let #fields_var = plutus_data::is_plutus_data::aux::parse_constr_with_tag(#plutus_data_input_var, 0)?;
611+
let #fields_var = plutus_ledger_api::plutus_data::parse_constr_with_tag(#plutus_data_input_var, 0)?;
612612

613613
#from_fields
614614
})
@@ -641,14 +641,14 @@ fn data_with_named_fields_from_list_of_plutus_data(
641641
let field_decoded_stmts = field_idents.clone().zip(unparsed_field_idents.clone()).map(
642642
|(field_ident, unparsed_field_ident)| -> Stmt {
643643
parse_quote!(
644-
let #field_ident = plutus_data::IsPlutusData::from_plutus_data(#unparsed_field_ident)?;
644+
let #field_ident = plutus_ledger_api::plutus_data::IsPlutusData::from_plutus_data(#unparsed_field_ident)?;
645645
)
646646
},
647647
);
648648

649649
parse_quote!(
650650
{
651-
let [ #(#unparsed_field_idents),* ] = plutus_data::is_plutus_data::aux::parse_fixed_len_constr_fields::<#field_count>(#plutus_data_list_var)?;
651+
let [ #(#unparsed_field_idents),* ] = plutus_ledger_api::plutus_data::parse_fixed_len_constr_fields::<#field_count>(#plutus_data_list_var)?;
652652
#(#field_decoded_stmts)*
653653
Ok(#constructor{ #(#field_idents),* })
654654
}
@@ -678,7 +678,7 @@ fn data_with_unnamed_fields_from_list_of_plutus_data(
678678
});
679679

680680
parse_quote!({
681-
let [ #(#unparsed_field_idents),* ] = plutus_data::is_plutus_data::aux::parse_fixed_len_constr_fields::<#field_count>(#plutus_data_list_var)?;
681+
let [ #(#unparsed_field_idents),* ] = plutus_ledger_api::plutus_data::parse_fixed_len_constr_fields::<#field_count>(#plutus_data_list_var)?;
682682
#(#field_decoded_stmts)*
683683
Ok(#constructor(#(#parsed_field_idents),*))
684684
})
@@ -689,7 +689,7 @@ fn data_with_no_fields_from_list_of_plutus_data(
689689
list_of_plutus_data_var: &Ident,
690690
) -> Block {
691691
parse_quote!({
692-
let [ ] = plutus_data::is_plutus_data::aux::parse_fixed_len_constr_fields::<0>(#list_of_plutus_data_var)?;
692+
let [ ] = plutus_ledger_api::plutus_data::parse_fixed_len_constr_fields::<0>(#list_of_plutus_data_var)?;
693693
Ok(#constructor)
694694
})
695695
}

‎plutus-ledger-api/Cargo.lock

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plutus-ledger-api/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ num-traits = "~0.2.17"
2222
impl_ops = "0.1.1"
2323
chrono = { version = "0.4.34", optional = true }
2424
cardano-serialization-lib = "12.1.0"
25+
is-plutus-data-derive = { path = ".extras/is-plutus-data-derive-0" }
2526
anyhow = "1.0.86"
26-
plutus-data = { path = ".extras/plutus-data-0", features = [ "derive" ]}
2727

2828
[features]
2929
default = []
30-
serde = ["dep:serde", "num-bigint/serde", "dep:serde_json", "plutus-data/serde"]
31-
lbf = ["dep:lbr-prelude", "dep:serde_json", "plutus-data/lbf"]
30+
serde = ["dep:serde", "num-bigint/serde", "dep:serde_json"]
31+
lbf = ["dep:lbr-prelude", "dep:serde_json"]
3232
chrono = ["dep:chrono"]
3333

3434
[dev-dependencies]

‎plutus-ledger-api/src/lamval.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
use crate::plutus_data::{self, PlutusData, PlutusDataError};
1+
use crate::plutus_data::PlutusDataError;
2+
use crate::plutus_data::{self, PlutusData};
3+
24
use num_bigint::BigInt;
35

46
pub fn case_plutus_data<'a, T: 'a>(

0 commit comments

Comments
 (0)