cleanup

ethereum · Jun 30, 2021 · 0403161 · 0403161
1 parent 64241fb
commit 0403161
Show file tree

Hide file tree

Showing 31 changed files with 565 additions and 568 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/analyzer/src/namespace/types.rs b/crates/analyzer/src/namespace/types.rs
@@ -68,10 +68,6 @@ impl AbiType {
     }
 }
 
-pub fn ceil_32(n: usize) -> usize {
-    ((n + 31) / 32) * 32
-}
-
 /// Data can be decoded from memory or calldata.
 #[derive(Clone, Debug, PartialEq, PartialOrd, Ord, Eq, Copy)]
 pub enum AbiDecodeLocation {

diff --git a/crates/analyzer/tests/snapshots/analysis__assert.snap b/crates/analyzer/tests/snapshots/analysis__assert.snap
@@ -249,7 +249,7 @@ note:
   │  
 2 │ ╭     pub def bar(baz: u256):
 3 │ │         assert baz > 5
-  │ ╰──────────────────────^ attributes hash: 15822262529719405181
+  │ ╰──────────────────────^ attributes hash: 10099444286773984657
   │  
   = FunctionAttributes {
         is_public: true,
@@ -274,7 +274,7 @@ note:
   │  
 5 │ ╭     pub def revert_with_static_string(baz: u256):
 6 │ │         assert baz > 5, "Must be greater than five"
-  │ ╰───────────────────────────────────────────────────^ attributes hash: 17432662740340635293
+  │ ╰───────────────────────────────────────────────────^ attributes hash: 5022511224749644990
   │  
   = FunctionAttributes {
         is_public: true,
@@ -299,7 +299,7 @@ note:
   │  
 8 │ ╭     pub def revert_with(baz: u256, reason: String<1000>):
 9 │ │         assert baz > 5, reason
-  │ ╰──────────────────────────────^ attributes hash: 15346937376382820850
+  │ ╰──────────────────────────────^ attributes hash: 7270738123661022492
   │  
   = FunctionAttributes {
         is_public: true,
@@ -337,7 +337,7 @@ note:
   · │
 8 │ │     pub def revert_with(baz: u256, reason: String<1000>):
 9 │ │         assert baz > 5, reason
-  │ ╰──────────────────────────────^ attributes hash: 7910349604985706298
+  │ ╰──────────────────────────────^ attributes hash: 7767111938691910304
   │  
   = ContractAttributes {
         public_functions: [

diff --git a/crates/analyzer/tests/snapshots/analysis__create2_contract.snap b/crates/analyzer/tests/snapshots/analysis__create2_contract.snap
@@ -148,7 +148,7 @@ note:
   ┌─ features/create2_contract.fe:9:16
   │
 9 │         return address(foo)
-  │                ^^^^^^^^^^^^ attributes hash: 513065555763557710
+  │                ^^^^^^^^^^^^ attributes hash: 16366719240912622931
   │
   = ExpressionAttributes {
         typ: Base(
@@ -183,7 +183,7 @@ note:
 7 │ │         # value and salt
 8 │ │         foo: Foo = Foo.create2(0, 52)
 9 │ │         return address(foo)
-  │ ╰───────────────────────────^ attributes hash: 11270695810756310777
+  │ ╰───────────────────────────^ attributes hash: 15788904857074118116
   │  
   = FunctionAttributes {
         is_public: true,
@@ -224,7 +224,7 @@ note:
 1 │ ╭ contract Foo:
 2 │ │     pub def get_my_num() -> u256:
 3 │ │         return 42
-  │ ╰─────────────────^ attributes hash: 8309658977386373707
+  │ ╰─────────────────^ attributes hash: 10466279856294948272
   │  
   = ContractAttributes {
         public_functions: [
@@ -267,7 +267,7 @@ note:
 7 │ │         # value and salt
 8 │ │         foo: Foo = Foo.create2(0, 52)
 9 │ │         return address(foo)
-  │ ╰───────────────────────────^ attributes hash: 11718874792159837218
+  │ ╰───────────────────────────^ attributes hash: 9489720864976305437
   │  
   = ContractAttributes {
         public_functions: [
@@ -333,7 +333,7 @@ note:
   ┌─ features/create2_contract.fe:9:16
   │
 9 │         return address(foo)
-  │                ^^^^^^^ attributes hash: 6114858510168753394
+  │                ^^^^^^^ attributes hash: 12543456546113081273
   │
   = TypeConstructor {
         typ: Base(
@@ -357,7 +357,7 @@ note:
   ┌─ features/create2_contract.fe:6:30
   │
 6 │     pub def create2_foo() -> address:
-  │                              ^^^^^^^ attributes hash: 574436082528610497
+  │                              ^^^^^^^ attributes hash: 16931239362436195516
   │
   = Base(
         Address,

diff --git a/crates/analyzer/tests/snapshots/analysis__create_contract.snap b/crates/analyzer/tests/snapshots/analysis__create_contract.snap
@@ -132,7 +132,7 @@ note:
   ┌─ features/create_contract.fe:8:16
   │
 8 │         return address(foo)
-  │                ^^^^^^^^^^^^ attributes hash: 513065555763557710
+  │                ^^^^^^^^^^^^ attributes hash: 16366719240912622931
   │
   = ExpressionAttributes {
         typ: Base(
@@ -166,7 +166,7 @@ note:
 6 │ ╭     pub def create_foo() -> address:
 7 │ │         foo: Foo = Foo.create(0)
 8 │ │         return address(foo)
-  │ ╰───────────────────────────^ attributes hash: 15105527221342038630
+  │ ╰───────────────────────────^ attributes hash: 11307555315188767880
   │  
   = FunctionAttributes {
         is_public: true,
@@ -207,7 +207,7 @@ note:
 1 │ ╭ contract Foo:
 2 │ │     pub def get_my_num() -> u256:
 3 │ │         return 42
-  │ ╰─────────────────^ attributes hash: 1249068046238630911
+  │ ╰─────────────────^ attributes hash: 16252373182675216901
   │  
   = ContractAttributes {
         public_functions: [
@@ -249,7 +249,7 @@ note:
 6 │ │     pub def create_foo() -> address:
 7 │ │         foo: Foo = Foo.create(0)
 8 │ │         return address(foo)
-  │ ╰───────────────────────────^ attributes hash: 1619027558401104719
+  │ ╰───────────────────────────^ attributes hash: 15817588436725138336
   │  
   = ContractAttributes {
         public_functions: [
@@ -315,7 +315,7 @@ note:
   ┌─ features/create_contract.fe:8:16
   │
 8 │         return address(foo)
-  │                ^^^^^^^ attributes hash: 6114858510168753394
+  │                ^^^^^^^ attributes hash: 12543456546113081273
   │
   = TypeConstructor {
         typ: Base(
@@ -339,7 +339,7 @@ note:
   ┌─ features/create_contract.fe:6:29
   │
 6 │     pub def create_foo() -> address:
-  │                             ^^^^^^^ attributes hash: 574436082528610497
+  │                             ^^^^^^^ attributes hash: 16931239362436195516
   │
   = Base(
         Address,