feat: Remove generics from sv::messages in examples

CosmWasm · Apr 22, 2024 · 292e12c · 292e12c
1 parent 959c9ae
commit 292e12c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -689,7 +689,7 @@ where
 }
 ```
 
-### Implement interface
+### Implement interface with associated types
 
 ```rust
 impl<InstantiateParam, ExecParam, FieldType>
@@ -723,24 +723,6 @@ impl<InstantiateParam, ExecParam, FieldType>
 }
 ```
 
-Now we have to inform Sylvia that the interface implemented for the contract has associated types.
-We have to list those types (generics or concrete) next to the interface in the `#[sv::messages]`
-attribute:
-
-```rust
-#[contract]
-#[sv::messages(generic<ExecParam, SvCustomMsg, SvCustomMsg> as Generic)]
-impl<InstantiateParam, ExecParam, FieldType>
-    GenericContract<InstantiateParam, ExecParam, FieldType>
-where
-    for<'msg_de> InstantiateParam: CustomMsg + Deserialize<'msg_de> + 'msg_de,
-    ExecParam: CustomMsg + DeserializeOwned + 'static,
-    FieldType: 'static,
-{
-    ...
-}
-```
-
 ### Generics in entry_points
 
 Entry points have to be generated with concrete types. Using the `entry_points` macro

diff --git a/examples/contracts/generic_contract/src/contract.rs b/examples/contracts/generic_contract/src/contract.rs
@@ -50,8 +50,8 @@ pub struct GenericContract<
 #[cfg_attr(not(feature = "library"), entry_points(generics<SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, String>))]
 #[contract]
 #[sv::messages(cw1 as Cw1: custom(msg, query))]
-#[sv::messages(generic<SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg> as Generic: custom(msg, query))]
-#[sv::messages(custom_and_generic<SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg> as CustomAndGeneric)]
+#[sv::messages(generic as Generic: custom(msg, query))]
+#[sv::messages(custom_and_generic as CustomAndGeneric)]
 #[sv::custom(msg=SvCustomMsg, query=SvCustomQuery)]
 impl<
         InstantiateT,

diff --git a/examples/contracts/generic_iface_on_contract/src/contract.rs b/examples/contracts/generic_iface_on_contract/src/contract.rs
@@ -17,8 +17,8 @@ impl cosmwasm_std::CustomQuery for SvCustomQuery {}
 
 #[cfg_attr(not(feature = "library"), entry_points)]
 #[contract]
-#[sv::messages(generic<SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg> as Generic: custom(msg, query))]
-#[sv::messages(custom_and_generic<SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg> as CustomAndGeneric)]
+#[sv::messages(generic as Generic: custom(msg, query))]
+#[sv::messages(custom_and_generic as CustomAndGeneric)]
 #[sv::messages(cw1 as Cw1: custom(msg, query))]
 /// Required if interface returns generic `Response`
 #[sv::custom(msg=SvCustomMsg, query=SvCustomQuery)]

diff --git a/examples/contracts/generics_forwarded/src/contract.rs b/examples/contracts/generics_forwarded/src/contract.rs
@@ -53,9 +53,9 @@ pub struct GenericsForwardedContract<
 #[cfg_attr(not(feature = "library"), sylvia::entry_points(generics<SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomMsg, SvCustomQuery, String>, custom(msg=SvCustomMsg, query=SvCustomQuery)))]
 #[contract]
 #[sv::error(ContractError)]
-#[sv::messages(generic<Exec1T, Exec2T, Exec3T, Query1T, Query2T, Query3T, Sudo1T, Sudo2T, Sudo3T, SvCustomMsg> as Generic: custom(msg, query))]
+#[sv::messages(generic as Generic: custom(msg, query))]
 #[sv::messages(cw1 as Cw1: custom(msg, query))]
-#[sv::messages(custom_and_generic<Exec1T, Exec2T, Exec3T, Query1T, Query2T, Query3T, Sudo1T, Sudo2T, Sudo3T, SvCustomMsg> as CustomAndGeneric)]
+#[sv::messages(custom_and_generic as CustomAndGeneric)]
 #[sv::custom(msg=CustomMsgT, query=CustomQueryT)]
 impl<
         InstantiateT,

diff --git a/sylvia-derive/src/parser/attributes/messages.rs b/sylvia-derive/src/parser/attributes/messages.rs
@@ -105,7 +105,7 @@ impl Parse for ContractMessageAttr {
         if !input.is_empty() {
             emit_error!(input.span(),
                 "Unexpected tokens inside `sv::messages` attribtue.";
-                note = "Maximal supported form of attribute: `#[sv::messages(interface::path<T1, T2> as InterfaceName: custom(msg, query))]`."
+                note = "Maximal supported form of attribute: `#[sv::messages(interface::path as InterfaceName: custom(msg, query))]`."
             )
         }
         Ok(Self {

diff --git a/sylvia/tests/ui/attributes/messages/unexpected_token.stderr b/sylvia/tests/ui/attributes/messages/unexpected_token.stderr
@@ -1,6 +1,6 @@
 error: Unexpected tokens inside `sv::messages` attribtue.
 
-         = note: Maximal supported form of attribute: `#[sv::messages(interface::path<T1, T2> as InterfaceName: custom(msg, query))]`.
+         = note: Maximal supported form of attribute: `#[sv::messages(interface::path as InterfaceName: custom(msg, query))]`.
 
   --> tests/ui/attributes/messages/unexpected_token.rs:24:25
    |