@@ -142,7 +142,7 @@ macro_rules! impl_lotus_json_for_label {
142142 } ;
143143}
144144
145- impl_lotus_json_for_label ! ( 15 , 16 ) ;
145+ impl_lotus_json_for_label ! ( 13 , 14 , 15 , 16 ) ;
146146
147147#[ derive( Serialize , Deserialize , JsonSchema , Debug , Clone , PartialEq ) ]
148148#[ serde( rename_all = "PascalCase" ) ]
@@ -161,9 +161,7 @@ pub struct DealProposalLotusJson {
161161 #[ schemars( with = "LotusJson<Address>" ) ]
162162 #[ serde( with = "crate::lotus_json" ) ]
163163 pub provider : Address ,
164- // #[schemars(with = "LotusJson<Label>")]
165- // #[serde(with = "crate::lotus_json")]
166- // pub label: Label,
164+ pub label : LabelLotusJson ,
167165 pub start_epoch : ChainEpoch ,
168166 pub end_epoch : ChainEpoch ,
169167 #[ schemars( with = "LotusJson<TokenAmount>" ) ]
@@ -210,7 +208,7 @@ macro_rules! impl_lotus_json_for_deal_proposal {
210208 verified_deal: verified_deal. into( ) ,
211209 client: client. into( ) ,
212210 provider: provider. into( ) ,
213- // label: label.into (),
211+ label: label. into_lotus_json ( ) ,
214212 start_epoch: start_epoch. into( ) ,
215213 end_epoch: end_epoch. into( ) ,
216214 storage_price_per_epoch: storage_price_per_epoch. into( ) ,
@@ -226,7 +224,7 @@ macro_rules! impl_lotus_json_for_deal_proposal {
226224 verified_deal,
227225 client,
228226 provider,
229- // label,
227+ label,
230228 start_epoch,
231229 end_epoch,
232230 storage_price_per_epoch,
@@ -239,7 +237,7 @@ macro_rules! impl_lotus_json_for_deal_proposal {
239237 verified_deal,
240238 client: client. into( ) ,
241239 provider: provider. into( ) ,
242- label: todo! ( ) ,
240+ label: fil_actor_market_state :: [ <v $version> ] :: Label :: from_lotus_json ( label ) , // delegate
243241 start_epoch,
244242 end_epoch,
245243 storage_price_per_epoch: storage_price_per_epoch. into( ) ,
@@ -338,5 +336,4 @@ macro_rules! impl_lotus_json_for_publish_storage_deals_params {
338336 } ;
339337}
340338
341- //impl_lotus_json_for_publish_storage_deals_params!(9, 10, 11, 12, 13, 14, 15, 16);
342339impl_lotus_json_for_publish_storage_deals_params ! ( 13 , 14 , 15 , 16 ) ;
0 commit comments