Merge pull request #971 from CosmWasm/rename-kind-to-ty

Rename `Event.kind` to `Event.ty`

Author: webmaster128

CHANGELOG.md

@@ -50,6 +50,7 @@ and this project adheres to
   limit to any those constructors ([#961]).
 - cosmwasm-std: Change `Event`'s constructor - it no longer takes a vector of
   attributes and instead constructs an empty one
+- cosmwasm-std: Rename `Event.kind` to `Event.ty`.
 
 [#961]: https://github.com/CosmWasm/cosmwasm/pull/961
 

contracts/ibc-reflect/src/contract.rs

@@ -50,7 +50,7 @@ pub fn reply(deps: DepsMut, _env: Env, reply: Reply) -> StdResult<Response> {
 fn parse_contract_from_event(events: Vec<Event>) -> Option<String> {
     events
         .into_iter()
-        .find(|e| e.kind == "message")
+        .find(|e| e.ty == "message")
         .and_then(|ev| {
             ev.attributes
                 .into_iter()
@@ -369,7 +369,7 @@ mod tests {
 
     fn fake_events(reflect_addr: &str) -> Vec<Event> {
         let event = Event {
-            kind: "message".into(),
+            ty: "message".into(),
             attributes: vec![
                 attr("module", "wasm"),
                 attr("signer", MOCK_CONTRACT_ADDR),

contracts/ibc-reflect/tests/integration.rs

@@ -58,7 +58,7 @@ fn setup() -> Instance<MockApi, MockStorage, MockQuerier> {
 
 fn fake_events(reflect_addr: &str) -> Vec<Event> {
     let event = Event {
-        kind: "message".into(),
+        ty: "message".into(),
         attributes: vec![
             attr("module", "wasm"),
             attr("signer", MOCK_CONTRACT_ADDR),

contracts/reflect/schema/response_for__custom_msg.json

@@ -327,7 +327,7 @@
           }
         },
         "type": {
-          "description": "The event type. This is renamed to \"kind\" because \"type\" is reserved in Rust. This sucks, we know.",
+          "description": "The event type. This is renamed to \"ty\" because \"type\" is reserved in Rust. This sucks, we know.",
           "type": "string"
         }
       }

packages/std/src/results/subcall.rs

@@ -126,17 +126,17 @@ pub struct SubcallResponse {
 /// the Rust-Go interface, JSON deserialization and the `NewEvent` call in Cosmos SDK.
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct Event {
-    /// The event type. This is renamed to "kind" because "type" is reserved in Rust. This sucks, we know.
+    /// The event type. This is renamed to "ty" because "type" is reserved in Rust. This sucks, we know.
     #[serde(rename = "type")]
-    pub kind: String,
+    pub ty: String,
     pub attributes: Vec<Attribute>,
 }
 
 impl Event {
     /// Create a new event with the given type and an empty list of attributes.
-    pub fn new(kind: impl Into<String>) -> Self {
+    pub fn new(ty: impl Into<String>) -> Self {
         Event {
-            kind: kind.into(),
+            ty: ty.into(),
             attributes: Vec::with_capacity(10),
         }
     }
@@ -159,7 +159,7 @@ mod tests {
     #[test]
     fn event_construction() {
         let event_direct = Event {
-            kind: "test".to_string(),
+            ty: "test".to_string(),
             attributes: vec![attr("foo", "bar"), attr("bar", "baz")],
         };
         let event_builder = Event::new("test").attr("foo", "bar").attr("bar", "baz");

packages/vm/src/calls.rs

@@ -711,7 +711,7 @@ mod tests {
             assert_eq!(ReplyOn::Success, res.messages[0].reply_on);
             let id = res.messages[0].id;
             let event = Event {
-                kind: "message".into(),
+                ty: "message".into(),
                 attributes: vec![attr("contract_address", &account)],
             };
             // which creates a reflect account. here we get the callback