wip

tserg · Jul 25, 2023 · d20e879 · d20e879
1 parent 39a9b93
commit d20e879
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/tests/parser/types/test_bytes.py b/tests/parser/types/test_bytes.py
@@ -1,6 +1,6 @@
 import pytest
 
-from vyper.exceptions import InvalidType, TypeMismatch
+from vyper.exceptions import InvalidLiteral, InvalidType, TypeMismatch
 
 
 def test_test_bytes(get_contract_with_gas_estimation, assert_tx_failed):
@@ -309,23 +309,23 @@ def assign():
 def assign():
     xs: bytes6 = b"abcdef"
     """,
-        InvalidType,
+        InvalidLiteral,
     ),
     (
         """
 @external
 def assign():
     xs: bytes4 = 0xabcdef  # bytes3 literal
     """,
-        InvalidType,
+        InvalidLiteral,
     ),
     (
         """
 @external
 def assign():
     xs: bytes4 = 0x1234abcdef # bytes5 literal
     """,
-        InvalidType,
+        InvalidLiteral,
     ),
 ]
 

diff --git a/vyper/semantics/analysis/local.py b/vyper/semantics/analysis/local.py
@@ -274,7 +274,7 @@ def visit_Assign(self, node):
         target.validate_modification(node, self.func.mutability)
 
         self.expr_visitor.visit(node.target, target.typ)
-        self.expr_visitor.visit(node.value)
+        self.expr_visitor.visit(node.value, target.typ)
 
         value_typ = node.value._metadata.get("type")
         if not target.typ.compare_type(value_typ):

diff --git a/vyper/semantics/types/primitives.py b/vyper/semantics/types/primitives.py
@@ -86,7 +86,7 @@ def validate_literal(self, node: vy_ast.Constant) -> None:
         val = node.value
 
         if node.n_bytes != self.m:
-            raise InvalidLiteral("Invalid literal for type {self}", node)
+            raise InvalidLiteral(f"Invalid literal for type {self}", node)
 
         nibbles = val[2:]  # strip leading 0x
         if nibbles not in (nibbles.lower(), nibbles.upper()):