Skip to content

Commit

Permalink
chore: Remove MessageSignature from multitest
Browse files Browse the repository at this point in the history
  • Loading branch information
@jawoznia
jawoznia committed Oct 16, 2023
1 parent a91b3e7 commit 7b4ae63
Show file tree
Hide file tree
Showing 2 changed files with 256 additions and 214 deletions.
194 changes: 194 additions & 0 deletions sylvia-derive/src/message.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,13 +648,149 @@ impl<'a> MsgVariant<'a> {
}
}

pub fn emit_multitest_proxy_methods(
&self,
msg_ty: &MsgType,
custom_msg: &Type,
mt_app: &Type,
error_type: &Type,
) -> TokenStream {
let sylvia = crate_module();
let Self {
name,
fields,
return_type,
..
} = self;

let params = fields.iter().map(|field| field.emit_method_field());
let arguments = fields.iter().map(MsgField::name);
let name = Ident::new(&name.to_string().to_case(Case::Snake), name.span());

match msg_ty {
MsgType::Exec => quote! {
#[track_caller]
pub fn #name (&self, #(#params,)* ) -> #sylvia ::multitest::ExecProxy::<#error_type, ExecMsg, #mt_app, #custom_msg> {
let msg = ExecMsg:: #name ( #(#arguments),* );

#sylvia ::multitest::ExecProxy::new(&self.contract_addr, msg, &self.app)
}
},
MsgType::Migrate => quote! {
#[track_caller]
pub fn #name (&self, #(#params,)* ) -> #sylvia ::multitest::MigrateProxy::<#error_type, MigrateMsg, #mt_app, #custom_msg> {
let msg = MigrateMsg::new( #(#arguments),* );

#sylvia ::multitest::MigrateProxy::new(&self.contract_addr, msg, &self.app)
}
},
MsgType::Query => quote! {
pub fn #name (&self, #(#params,)* ) -> Result<#return_type, #error_type> {
let msg = QueryMsg:: #name ( #(#arguments),* );

(*self.app)
.app()
.wrap()
.query_wasm_smart(self.contract_addr.clone(), &msg)
.map_err(Into::into)
}
},
_ => quote! {},

Check warning on line 698 in sylvia-derive/src/message.rs

View check run for this annotation

Codecov / codecov/patch

sylvia-derive/src/message.rs#L698 

Added line #L698 was not covered by tests
}
}

pub fn emit_interface_multitest_proxy_methods<Generics>(
&self,
msg_ty: &MsgType,
custom_msg: &Type,
mt_app: &Type,
error_type: &Type,
generics: &[&Generics],
module: &TokenStream,
) -> TokenStream
where
Generics: ToTokens,
{
let sylvia = crate_module();
let Self {
name,
fields,
return_type,
..
} = self;

let params = fields.iter().map(|field| field.emit_method_field());
let arguments = fields.iter().map(MsgField::name);
let bracketed_generics = emit_bracketed_generics(generics);
let interface_enum = quote! { < #module InterfaceTypes #bracketed_generics as #sylvia ::types::InterfaceMessages> };
let type_name = msg_ty.as_accessor_name();
let name = Ident::new(&name.to_string().to_case(Case::Snake), name.span());

match msg_ty {
MsgType::Exec => quote! {
#[track_caller]
fn #name (&self, #(#params,)* ) -> #sylvia ::multitest::ExecProxy::<#error_type, #interface_enum :: #type_name, #mt_app, #custom_msg> {
let msg = #interface_enum :: #type_name :: #name ( #(#arguments),* );

#sylvia ::multitest::ExecProxy::new(&self.contract_addr, msg, &self.app)
}
},
MsgType::Query => quote! {
fn #name (&self, #(#params,)* ) -> Result<#return_type, #error_type> {
let msg = #interface_enum :: #type_name :: #name ( #(#arguments),* );

(*self.app)
.app()
.wrap()
.query_wasm_smart(self.contract_addr.clone(), &msg)
.map_err(Into::into)
}
},
_ => quote! {},

Check warning on line 749 in sylvia-derive/src/message.rs

View check run for this annotation

Codecov / codecov/patch

sylvia-derive/src/message.rs#L749 

Added line #L749 was not covered by tests
}
}

pub fn emit_proxy_methods_declarations(
&self,
msg_ty: &MsgType,
custom_msg: &Type,
error_type: &Type,
interface_enum: &TokenStream,
) -> TokenStream {
let sylvia = crate_module();
let Self {
name,
fields,
return_type,
..
} = self;

let params = fields.iter().map(|field| field.emit_method_field());
let type_name = msg_ty.as_accessor_name();
let name = Ident::new(&name.to_string().to_case(Case::Snake), name.span());

match msg_ty {
MsgType::Exec => quote! {
fn #name (&self, #(#params,)* ) -> #sylvia ::multitest::ExecProxy::<#error_type, #interface_enum :: #type_name, MtApp, #custom_msg>;
},
MsgType::Query => quote! {
fn #name (&self, #(#params,)* ) -> Result<#return_type, #error_type>;
},
_ => quote! {},

Check warning on line 779 in sylvia-derive/src/message.rs

View check run for this annotation

Codecov / codecov/patch

sylvia-derive/src/message.rs#L779 

Added line #L779 was not covered by tests
}
}

pub fn as_fields_names(&self) -> Vec<&Ident> {
self.fields.iter().map(MsgField::name).collect()
}

pub fn emit_fields(&self) -> Vec<TokenStream> {
self.fields.iter().map(MsgField::emit).collect()
}

pub fn name(&self) -> &Ident {
&self.name
}
}

#[derive(Debug)]
Expand Down Expand Up @@ -884,6 +1020,64 @@ where
}
}
}
pub fn emit_multitest_proxy_methods(
&self,
custom_msg: &Type,
mt_app: &Type,
error_type: &Type,
) -> Vec<TokenStream> {
self.variants
.iter()
.map(|variant| {
variant.emit_multitest_proxy_methods(&self.msg_ty, custom_msg, mt_app, error_type)
})
.collect()
}

pub fn emit_interface_multitest_proxy_methods<Generics>(
&self,
custom_msg: &Type,
mt_app: &Type,
error_type: &Type,
generics: &[&Generics],
module: &TokenStream,
) -> Vec<TokenStream>
where
Generics: ToTokens,
{
self.variants
.iter()
.map(|variant| {
variant.emit_interface_multitest_proxy_methods(
&self.msg_ty,
custom_msg,
mt_app,
error_type,
generics,
module,
)
})
.collect()
}

pub fn emit_proxy_methods_declarations(
&self,
custom_msg: &Type,
error_type: &Type,
interface_enum: &TokenStream,
) -> Vec<TokenStream> {
self.variants
.iter()
.map(|variant| {
variant.emit_proxy_methods_declarations(
&self.msg_ty,
custom_msg,
error_type,
interface_enum,
)
})
.collect()
}

pub fn emit_dispatch_legs(&self) -> impl Iterator<Item = TokenStream> + '_ {
self.variants
Expand Down
Loading

0 comments on commit 7b4ae63

Please sign in to comment.