Update tests

ethereum · Feb 6, 2022 · 23d59a4 · 23d59a4
1 parent f77dcec
commit 23d59a4
Show file tree

Hide file tree

Showing 7 changed files with 369 additions and 373 deletions.
diff --git a/crates/analyzer/tests/snapshots/analysis__module_level_events.snap b/crates/analyzer/tests/snapshots/analysis__module_level_events.snap
@@ -6,33 +6,33 @@ expression: "build_snapshot(&files, module_id, &db)"
 note: 
   ┌─ features/module_level_events.fe:2:5
   │
-2 │     idx sum: u256
-  │     ^^^^^^^^^^^^^ u256
+2 │     idx sender: address
+  │     ^^^^^^^^^^^^^^^^^^^ address
+3 │     idx receiver: address
+  │     ^^^^^^^^^^^^^^^^^^^^^ address
+4 │     value: u256
+  │     ^^^^^^^^^^^ u256
 
 note: 
-  ┌─ features/module_level_events.fe:4:5
+  ┌─ features/module_level_events.fe:6:5
   │  
-4 │ ╭     pub fn add(a: u256, b: u256) -> u256:
-5 │ │         let sum: u256 = a + b
-6 │ │         emit Added(sum=sum)
-7 │ │         return a + b
-  │ ╰────────────────────^ attributes hash: 10094331793610550579
+6 │ ╭     fn transfer(to : address, value : u256):
+7 │ │         emit Transfer(sender=msg.sender, receiver=to, value)
+  │ ╰────────────────────────────────────────────────────────────^ attributes hash: 5430479256040439660
   │  
   = FunctionSignature {
         self_decl: None,
         params: [
             FunctionParam {
-                name: "a",
+                name: "to",
                 typ: Ok(
                     Base(
-                        Numeric(
-                            U256,
-                        ),
+                        Address,
                     ),
                 ),
             },
             FunctionParam {
-                name: "b",
+                name: "value",
                 typ: Ok(
                     Base(
                         Numeric(
@@ -44,64 +44,57 @@ note:
         ],
         return_type: Ok(
             Base(
-                Numeric(
-                    U256,
-                ),
+                Unit,
             ),
         ),
     }
 
 note: 
-  ┌─ features/module_level_events.fe:5:18
-  │
-5 │         let sum: u256 = a + b
-  │                  ^^^^ u256
-
-note: 
-  ┌─ features/module_level_events.fe:5:25
+  ┌─ features/module_level_events.fe:7:30
   │
-5 │         let sum: u256 = a + b
-  │                         ^   ^ u256: Value
-  │                         │    
-  │                         u256: Value
+7 │         emit Transfer(sender=msg.sender, receiver=to, value)
+  │                              ^^^^^^^^^^           ^^  ^^^^^ u256: Value
+  │                              │                    │    
+  │                              │                    address: Value
+  │                              address: Value
 
 note: 
-  ┌─ features/module_level_events.fe:5:25
+  ┌─ features/module_level_events.fe:7:9
   │
-5 │         let sum: u256 = a + b
-  │                         ^^^^^ u256: Value
-6 │         emit Added(sum=sum)
-  │                        ^^^ u256: Value
-7 │         return a + b
-  │                ^   ^ u256: Value
-  │                │    
-  │                u256: Value
-
-note: 
-  ┌─ features/module_level_events.fe:7:16
-  │
-7 │         return a + b
-  │                ^^^^^ u256: Value
-
-note: 
-  ┌─ features/module_level_events.fe:6:9
-  │
-6 │         emit Added(sum=sum)
-  │         ^^^^^^^^^^^^^^^^^^^ attributes hash: 3277580564244611338
+7 │         emit Transfer(sender=msg.sender, receiver=to, value)
+  │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 17986960071624595337
   │
   = Event {
-        name: "Added",
+        name: "Transfer",
         fields: [
             EventField {
-                name: "sum",
+                name: "sender",
+                typ: Ok(
+                    Base(
+                        Address,
+                    ),
+                ),
+                is_indexed: true,
+            },
+            EventField {
+                name: "receiver",
+                typ: Ok(
+                    Base(
+                        Address,
+                    ),
+                ),
+                is_indexed: true,
+            },
+            EventField {
+                name: "value",
                 typ: Ok(
                     Base(
                         Numeric(
                             U256,
                         ),
                     ),
                 ),
-                is_indexed: true,
+                is_indexed: false,
             },
         ],
     }

diff --git a/crates/lowering/tests/snapshots/lowering__module_level_events.snap b/crates/lowering/tests/snapshots/lowering__module_level_events.snap
@@ -3,11 +3,12 @@ source: crates/lowering/tests/lowering.rs
 expression: lowered_code
 
 ---
-event Added:
-    idx sum: u256
+event Transfer:
+    idx sender: address
+    idx receiver: address
+    value: u256
 
-contract Adder:
-    pub fn add(a: u256, b: u256) -> u256:
-        let sum: u256 = a + b
-        emit Added(sum=sum)
-        return a + b
+contract Foo:
+    fn transfer(to: address, value: u256) -> ():
+        emit Transfer(sender=msg.sender, receiver=to, value)
+        return ()
diff --git a/crates/parser/tests/cases/parse_ast.rs b/crates/parser/tests/cases/parse_ast.rs
@@ -228,12 +228,12 @@ contract GuestBook:
         return self.guest_book[addr]
 "# }
 
-test_parse! { module_level_event, module::parse_module, r#"
-event Added:
-    idx sum: u256
-contract Adder:
-    pub fn add(a: u256, b: u256) -> u256:
-        let sum: u256 = a + b
-        emit Added(sum=sum)
-        return a + b
+test_parse! { module_level_events, module::parse_module, r#"
+event Transfer:
+    idx sender: address
+    idx receiver: address
+    value: u256
+contract Foo:
+    fn transfer(to : address, value : u256):
+        emit Transfer(sender=msg.sender, receiver=to, value)
 "# }