feat!: Remove replies from sv::features pre 2.0.0 release

examples/contracts/generic_contract/src/contract.rs

@@ -54,7 +54,6 @@ pub struct GenericContract<
 #[sv::messages(generic as Generic: custom(msg, query))]
 #[sv::messages(custom_and_generic as CustomAndGeneric)]
 #[sv::custom(msg=SvCustomMsg, query=SvCustomQuery)]
-#[sv::features(replies)]
 impl<
         InstantiateT,
         Exec1T,

examples/contracts/generics_forwarded/src/contract.rs

@@ -57,7 +57,6 @@ pub struct GenericsForwardedContract<
 #[sv::messages(cw1 as Cw1: custom(msg, query))]
 #[sv::messages(custom_and_generic as CustomAndGeneric)]
 #[sv::custom(msg=CustomMsgT, query=CustomQueryT)]
-#[sv::features(replies)]
 impl<
         InstantiateT,
         Exec1T,

sylvia-derive/src/contract.rs

@@ -47,7 +47,7 @@ pub struct ContractInput<'a> {
     custom: Custom,
     override_entry_points: Vec<OverrideEntryPoint>,
     interfaces: Interfaces,
-    sv_features: SylviaFeatures,
+    _sv_features: SylviaFeatures,
 }
 
 impl<'a> ContractInput<'a> {
@@ -69,7 +69,7 @@ impl<'a> ContractInput<'a> {
             custom,
             override_entry_points,
             interfaces,
-            sv_features,
+            _sv_features: sv_features,
         }
     }
 
@@ -189,10 +189,6 @@ impl<'a> ContractInput<'a> {
     }
 
     fn emit_reply(&self) -> TokenStream {
-        if !self.sv_features.replies {
-            return quote! {};
-        }
-
         let variants = MsgVariants::new(self.item.as_variants(), MsgType::Reply, &[], &None);
 
         Reply::new(self.item, &self.generics, &variants).emit()

sylvia-derive/src/contract/mt.rs

@@ -4,7 +4,6 @@
 use syn::{parse_quote, GenericParam, ItemImpl, Type};
 
 use crate::crate_module;
-use crate::parser::attributes::features::SylviaFeatures;
 use crate::parser::attributes::msg::MsgType;
 use crate::parser::variant_descs::AsVariantDescs;
 use crate::parser::{
@@ -24,7 +23,6 @@
     where_clause: &'a Option<syn::WhereClause>,
     custom: &'a Custom,
     override_entry_points: Vec<OverrideEntryPoint>,
-    sv_features: SylviaFeatures,
     instantiate_variant: MsgVariants<'a, GenericParam>,
     exec_variants: MsgVariants<'a, GenericParam>,
     query_variants: MsgVariants<'a, GenericParam>,
@@ -81,7 +79,6 @@
         let parsed_attrs = ParsedSylviaAttributes::new(source.attrs.iter());
         let error_type = parsed_attrs.error_attrs.unwrap_or_default().error;
         let error_type = parse_quote! { #error_type };
-        let sv_features = parsed_attrs.sv_features;
 
         let contract_name = &source.self_ty;
 
@@ -93,7 +90,6 @@
             contract_name,
             custom,
             override_entry_points,
-            sv_features,
             instantiate_variant,
             exec_variants,
             query_variants,
@@ -480,7 +476,6 @@
             contract_name,
             custom,
             override_entry_points,
-            sv_features,
             generic_params,
             migrate_variants,
             reply_variants,
@@ -532,16 +527,9 @@
                         quote! { #contract_ident }
                     };
 
-                    if sv_features.replies {
-                        quote! {
-                            let contract = #contract_turbofish ::new();
-                            dispatch_reply(deps, env, msg, contract).map_err(Into::into)
-                        }
-                    } else {
-                        let reply_name = _reply.name().to_case(Case::Snake);
-                        quote! {
-                            self. #reply_name ((deps, env).into(), msg).map_err(Into::into)
-                        }
+                    quote! {
+                        let contract = #contract_turbofish ::new();
+                        dispatch_reply(deps, env, msg, contract).map_err(Into::into)
                     }
                 })
                 .unwrap_or_else(|| {

sylvia-derive/src/entry_points.rs

@@ -69,7 +69,7 @@
     generics: Vec<&'a GenericParam>,
     where_clause: &'a Option<WhereClause>,
     attrs: &'a EntryPointArgs,
-    sv_features: SylviaFeatures,
+    _sv_features: SylviaFeatures,
 }
 
 impl<'a> EntryPoints<'a> {
@@ -99,7 +99,7 @@
             generics,
             where_clause,
             attrs,
-            sv_features,
+            _sv_features: sv_features,
         }
     }
 
@@ -172,12 +172,7 @@
 
     fn emit_default_entry_point(&self, msg_ty: MsgType) -> TokenStream {
         let Self {
-            name,
-            error,
-            attrs,
-            reply,
-            sv_features,
-            ..
+            name, error, attrs, ..
         } = self;
         let sylvia = crate_module();
 
@@ -206,13 +201,10 @@
             _ => quote! { msg: < #contract as #sylvia ::types::ContractApi> :: #associated_name },
         };
         let dispatch = match msg_ty {
-            MsgType::Reply if sv_features.replies => quote! {
+            MsgType::Reply => quote! {
                 let contract = #contract_turbofish ::new();
                 sv::dispatch_reply(deps, env, msg, contract).map_err(Into::into)
             },
-            MsgType::Reply => quote! {
-                #contract_turbofish ::new(). #reply((deps, env).into(), msg).map_err(Into::into)
-            },
             _ => quote! {
                 msg.dispatch(& #contract_turbofish ::new() , ( #values )).map_err(Into::into)
             },

sylvia-derive/src/lib.rs

@@ -282,7 +282,6 @@ fn interface_impl(_attr: TokenStream2, item: TokenStream2) -> TokenStream2 {
 ///
 /// ##[sylvia::contract]
 /// ##[sv::error(ContractError)]
-/// ##[sv::features(replies)]
 /// impl SvContract {
 ///     pub const fn new() -> Self {
 ///         Self {
@@ -628,29 +627,15 @@ fn interface_impl(_attr: TokenStream2, item: TokenStream2) -> TokenStream2 {
 /// Enables additional features for the contract. Allows user to use features that
 /// are considered breaking before the major release.
 ///
-/// Currently supported features are:
-/// * `replies` - enables better dispatching of `reply` as well as its auto deserialization.
-///     With this feature enabled, user can use additional parameters in the
-///     `sv::msg` attribute like so:
-///     `#[sv::msg(reply, handlers=[scenario1, scenario2], reply_on=Success)]`.
-///
-///     Based on this parameters reply ids will be generated and associated with
-///     proper scenario specified by the `reply_on` parameter.
-///
-///     User can also specify custom `data` and `payload` types that will be auto
-///     deserialized from the `cosmwasm_std::Binary` type.
+/// No currently supported features.
 ///
 /// ### `sv::payload(raw)`
 ///
-/// Requires contract to be marked with the `sv::features(replies)`.
-///
 /// Used next to the reply method argument. It disables auto deserialization
 /// of the payload argument.
 ///
 /// ### `sv::data(...)`
 ///
-/// Requires contract to be marked with the `sv::features(replies)`.
-///
 /// Used next to the reply method argument. Based on the passed parameters
 /// it enables different behavior:
 ///
@@ -740,7 +725,6 @@ fn contract_impl(attr: TokenStream2, item: TokenStream2) -> TokenStream2 {
 ///
 /// ##[sylvia::entry_points]
 /// ##[sylvia::contract]
-/// ##[sv::features(replies)]
 /// impl SvContract {
 ///     pub const fn new() -> Self {
 ///         Self

sylvia-derive/src/parser/attributes/features.rs

@@ -1,13 +1,10 @@
 use proc_macro_error::emit_error;
 use syn::parse::{Parse, ParseStream, Parser};
-use syn::{Error, Ident, MetaList, Result, Token};
+use syn::{Error, Ident, MetaList, Result};
 
 /// Type wrapping data parsed from `sv::features` attribute.
 #[derive(Debug, Default)]
-pub struct SylviaFeatures {
-    /// Enables better dispatching and deserialization for replies.
-    pub replies: bool,
-}
+pub struct SylviaFeatures {}
 
 impl SylviaFeatures {
     pub fn new(attr: &MetaList) -> Result<Self> {
@@ -22,23 +19,14 @@
 
 impl Parse for SylviaFeatures {
     fn parse(input: ParseStream) -> Result<Self> {
-        let mut features = Self::default();
+        let features = Self::default();
 
-        while !input.is_empty() {
+        if !input.is_empty() {
             let feature: Ident = input.parse()?;
-            match feature.to_string().as_str() {
-                "replies" => features.replies = true,
-                _ => {
-                    return Err(Error::new(
-                        feature.span(),
-                        "Invalid feature.\n= note: Supported features for contract macro: [`replies`].\n",
-                    ))
-                }
-            }
-            if !input.peek(Token![,]) {
-                break;
-            }
-            let _: Token![,] = input.parse()?;
+            return Err(Error::new(
+                feature.span(),
+                "Invalid feature.\n= note: No features supported currently.\n",
+            ));
         }
 
         Ok(features)

sylvia/tests/messages_generation.rs

@@ -87,7 +87,6 @@ mod contract {
     #[sv::msg_attr(instantiate, error("Instantiate"))]
     #[sv::msg_attr(migrate, derive(PartialOrd, Error))]
     #[sv::msg_attr(migrate, error("Migrate"))]
-    #[sv::features(replies)]
     impl Contract {
         #[allow(clippy::new_without_default)]
         #[allow(dead_code)]

sylvia/tests/reply_data.rs

@@ -83,7 +83,6 @@ pub struct Contract {
 #[entry_points]
 #[contract]
 #[sv::error(ContractError)]
-#[sv::features(replies)]
 impl Contract {
     pub fn new() -> Self {
         Self {

sylvia/tests/reply_dispatch.rs

@@ -80,7 +80,6 @@ pub struct Contract<M, Q> {
 #[contract]
 #[sv::error(ContractError)]
 #[sv::custom(msg=M, query=Q)]
-#[sv::features(replies)]
 impl<M, Q> Contract<M, Q>
 where
     M: CustomMsg + 'static,

sylvia/tests/reply_generation.rs

@@ -9,7 +9,6 @@ pub struct Contract;
 
 #[entry_points]
 #[contract]
-#[sv::features(replies)]
 impl Contract {
     pub fn new() -> Self {
         Self

sylvia/tests/ui/attributes/data/invalid_params.rs

@@ -10,7 +10,6 @@ pub mod invalid_data {
     pub struct Contract;
 
     #[contract]
-    #[sv::features(replies)]
     impl Contract {
         pub fn new() -> Self {
             Self
@@ -39,7 +38,6 @@ pub mod instantiate_and_raw {
     pub struct Contract;
 
     #[contract]
-    #[sv::features(replies)]
     impl Contract {
         pub fn new() -> Self {
             Self

sylvia/tests/ui/attributes/data/invalid_params.stderr

@@ -1,16 +1,16 @@
 error: Invalid data parameter.
 
          = note: Expected one of [`raw`, `opt`, `instantiate`] comma separated.
-  --> tests/ui/attributes/data/invalid_params.rs:28:24
+  --> tests/ui/attributes/data/invalid_params.rs:27:24
    |
-28 |             #[sv::data(invalid)] _data: Option<Binary>,
+27 |             #[sv::data(invalid)] _data: Option<Binary>,
    |                        ^^^^^^^
 
 error: The `instantiate` cannot be used in pair with `raw` parameter.
 
          = note: Use any combination of [`raw`, `opt`] or [`instantiate`, `opt`] pairs.
 
-  --> tests/ui/attributes/data/invalid_params.rs:57:24
+  --> tests/ui/attributes/data/invalid_params.rs:55:24
    |
-57 |             #[sv::data(instantiate, raw)] _data: Option<Binary>,
+55 |             #[sv::data(instantiate, raw)] _data: Option<Binary>,
    |                        ^^^^^^^^^^^

sylvia/tests/ui/attributes/data/invalid_usage.rs

@@ -8,7 +8,6 @@ pub mod attributes_swapped {
     pub struct Contract {}
 
     #[sylvia::contract]
-    #[sv::features(replies)]
     impl Contract {
         pub const fn new() -> Self {
             Self {}
@@ -37,7 +36,6 @@ pub mod error_handler {
     pub struct Contract {}
 
     #[sylvia::contract]
-    #[sv::features(replies)]
     impl Contract {
         pub const fn new() -> Self {
             Self {}

sylvia/tests/ui/attributes/data/invalid_usage.stderr

@@ -2,26 +2,26 @@ error: Wrong usage of `#[sv::data]` attribute.
 
          = note: The `#[sv::data]` attribute can only be used on the first parameter after the `ReplyCtx`.
 
-  --> tests/ui/attributes/data/invalid_usage.rs:27:35
+  --> tests/ui/attributes/data/invalid_usage.rs:26:35
    |
-27 |             #[sv::data(opt, raw)] _data: Option<Binary>,
+26 |             #[sv::data(opt, raw)] _data: Option<Binary>,
    |                                   ^^^^^
 
 error: Redundant payload parameter.
 
          = note: Expected no parameters after the parameter marked with `#[sv::payload(raw)]`.
 
-  --> tests/ui/attributes/data/invalid_usage.rs:27:35
+  --> tests/ui/attributes/data/invalid_usage.rs:26:35
    |
-27 |             #[sv::data(opt, raw)] _data: Option<Binary>,
+26 |             #[sv::data(opt, raw)] _data: Option<Binary>,
    |                                   ^^^^^
 
 error: Wrong usage of `#[sv::data]` attribute.
 
          = note: The `#[sv::data]` attribute can only be used in `success` scenario.
          = note: Found usage in `error` scenario.
 
-  --> tests/ui/attributes/data/invalid_usage.rs:55:35
+  --> tests/ui/attributes/data/invalid_usage.rs:53:35
    |
-55 |             #[sv::data(opt, raw)] _data: Option<Binary>,
+53 |             #[sv::data(opt, raw)] _data: Option<Binary>,
    |                                   ^^^^^

sylvia/tests/ui/attributes/features/invalid_params.stderr

@@ -1,5 +1,5 @@
 error: Invalid feature.
-       = note: Supported features for contract macro: [`replies`].
+       = note: No features supported currently.
  --> tests/ui/attributes/features/invalid_params.rs:9:16
   |
 9 | #[sv::features(unknown_parameter)]

sylvia/tests/ui/attributes/msg/overlapping_reply_handlers.rs

@@ -7,7 +7,6 @@ use sylvia::cw_std::{Reply, Response, StdResult};
 pub struct Contract;
 
 #[contract]
-#[sv::features(replies)]
 impl Contract {
     pub fn new() -> Self {
         Self

sylvia/tests/ui/attributes/msg/overlapping_reply_handlers.stderr

@@ -2,16 +2,16 @@ error: Duplicated reply handler.
 
          = note: Previous definition of handler=`HANDLER_1_REPLY_ID` for reply_on=`always` defined on `fn reply_always()`
 
-  --> tests/ui/attributes/msg/overlapping_reply_handlers.rs:31:32
+  --> tests/ui/attributes/msg/overlapping_reply_handlers.rs:30:32
    |
-31 |     #[sv::msg(reply, handlers=[handler1], reply_on=success)]
+30 |     #[sv::msg(reply, handlers=[handler1], reply_on=success)]
    |                                ^^^^^^^^
 
 error: Duplicated reply handler.
 
          = note: Previous definition of handler=`HANDLER_2_REPLY_ID` for reply_on=`error` defined on `fn some_reply()`
 
-  --> tests/ui/attributes/msg/overlapping_reply_handlers.rs:51:8
+  --> tests/ui/attributes/msg/overlapping_reply_handlers.rs:50:8
    |
-51 |     fn handler2(
+50 |     fn handler2(
    |        ^^^^^^^^