Sourcery refactored master branch

eopsin/compiler.py

@@ -292,8 +292,7 @@ def visit_Module(self, node: TypedModule) -> plt.AST:
             raise RuntimeError(
                 "The contract can not always detect if it was passed three or two parameters on-chain."
             )
-        cp = plt.Program("1.0.0", validator)
-        return cp
+        return plt.Program("1.0.0", validator)
 
     def visit_Constant(self, node: TypedConstant) -> plt.AST:
         plt_type = ConstantMap.get(type(node.value))
@@ -796,10 +795,7 @@ def visit_ListComp(self, node: TypedListComp) -> plt.AST:
         lst = plt.Apply(self.visit(gen.iter), plt.Var(STATEMONAD))
         ifs = None
         for ifexpr in gen.ifs:
-            if ifs is None:
-                ifs = self.visit(ifexpr)
-            else:
-                ifs = plt.And(ifs, self.visit(ifexpr))
+            ifs = self.visit(ifexpr) if ifs is None else plt.And(ifs, self.visit(ifexpr))
         map_fun = plt.Lambda(
             ["x"],
             plt.Apply(

eopsin/ledger/interval.py

@@ -6,12 +6,11 @@ def compare(a: int, b: int) -> int:
     # a == b: 0
     # a > b: -1
     if a < b:
-        result = 1
+        return 1
     elif a == b:
-        result = 0
+        return 0
     else:
-        result = -1
-    return result
+        return -1
 
 
 def compare_extended_helper(time: ExtendedPOSIXTime) -> int:
@@ -31,21 +30,15 @@ def compare_extended(a: ExtendedPOSIXTime, b: ExtendedPOSIXTime) -> int:
     # a > b: -1
     a_val = compare_extended_helper(a)
     b_val = compare_extended_helper(b)
-    if a_val == 0 and b_val == 0:
-        a_finite: FinitePOSIXTime = a
-        b_finite: FinitePOSIXTime = b
-        result = compare(a_finite.time, b_finite.time)
-    else:
-        result = compare(a_val, b_val)
-    return result
+    if a_val != 0 or b_val != 0:
+        return compare(a_val, b_val)
+    a_finite: FinitePOSIXTime = a
+    b_finite: FinitePOSIXTime = b
+    return compare(a_finite.time, b_finite.time)
 
 
 def get_bool(b: BoolData) -> bool:
-    if isinstance(b, TrueData):
-        result = True
-    else:
-        result = False
-    return result
+    return isinstance(b, TrueData)
 
 
 def compare_upper_bound(a: UpperBoundPOSIXTime, b: UpperBoundPOSIXTime) -> int:
@@ -76,7 +69,7 @@ def contains(a: POSIXTimeRange, b: POSIXTimeRange) -> bool:
     # Returns True if the interval `b` is entirely contained in `a`.
     lower = compare_lower_bound(a.lower_bound, b.lower_bound)
     upper = compare_upper_bound(a.upper_bound, b.upper_bound)
-    return (lower == 1 or lower == 0) and (upper == 0 or upper == -1)
+    return lower in [1, 0] and upper in [0, -1]
 
 
 def make_range(

eopsin/optimize/optimize_remove_deadvars.py

@@ -66,10 +66,7 @@ class OptimizeRemoveDeadvars(CompilingNodeTransformer):
 
     def guaranteed(self, name: str) -> bool:
         name = name
-        for scope in reversed(self.guaranteed_avail_names):
-            if name in scope:
-                return True
-        return False
+        return any(name in scope for scope in reversed(self.guaranteed_avail_names))
 
     def enter_scope(self):
         self.guaranteed_avail_names.append([])

eopsin/optimize/optimize_varlen.py

@@ -34,7 +34,7 @@ def visit_FunctionDef(self, node: FunctionDef):
 def bs_from_int(i: int):
     hex_str = f"{i:x}"
     if len(hex_str) % 2 == 1:
-        hex_str = "0" + hex_str
+        hex_str = f"0{hex_str}"
     return bytes.fromhex(hex_str)
 
 
@@ -47,11 +47,8 @@ def visit_Module(self, node: Module) -> Module:
         # collect all variable names
         collector = NameCollector()
         collector.visit(node)
-        # sort by most used
-        varmap = {}
         varnames = sorted(collector.vars.items(), key=lambda x: x[1], reverse=True)
-        for i, (v, _) in enumerate(varnames):
-            varmap[v] = bs_from_int(i)
+        varmap = {v: bs_from_int(i) for i, (v, _) in enumerate(varnames)}
         self.varmap = varmap
         node_cp = copy(node)
         node_cp.body = [self.visit(s) for s in node.body]

eopsin/prelude.py

@@ -495,11 +495,11 @@ def all_tokens_unlocked_from_address(
 ) -> int:
     """Returns how many tokens of specified type are unlocked from given address"""
     return sum(
-        [
-            txi.resolved.value.get(token.policy_id, {b"": 0}).get(token.token_name, 0)
-            for txi in txins
-            if txi.resolved.address == address
-        ]
+        txi.resolved.value.get(token.policy_id, {b"": 0}).get(
+            token.token_name, 0
+        )
+        for txi in txins
+        if txi.resolved.address == address
     )
 
 
@@ -508,11 +508,9 @@ def all_tokens_locked_at_address_with_datum(
 ) -> int:
     """Returns how many tokens of specified type are locked at then given address with the specified datum"""
     return sum(
-        [
-            txo.value.get(token.policy_id, {b"": 0}).get(token.token_name, 0)
-            for txo in txouts
-            if txo.address == address and txo.datum == output_datum
-        ]
+        txo.value.get(token.policy_id, {b"": 0}).get(token.token_name, 0)
+        for txo in txouts
+        if txo.address == address and txo.datum == output_datum
     )
 
 
@@ -521,11 +519,9 @@ def all_tokens_locked_at_address(
 ) -> int:
     """Returns how many tokens of specified type are locked at the given address"""
     return sum(
-        [
-            txo.value.get(token.policy_id, {b"": 0}).get(token.token_name, 0)
-            for txo in txouts
-            if txo.address == address
-        ]
+        txo.value.get(token.policy_id, {b"": 0}).get(token.token_name, 0)
+        for txo in txouts
+        if txo.address == address
     )
 
 

eopsin/rewrite/rewrite_augassign.py

@@ -15,12 +15,11 @@ class RewriteAugAssign(CompilingNodeTransformer):
     def visit_AugAssign(self, node: AugAssign) -> Assign:
         target_cp = copy(node.target)
         target_cp.ctx = Load()
-        a = Assign(
+        return Assign(
             [self.visit(node.target)],
             BinOp(
                 self.visit(target_cp),
                 self.visit(node.op),
                 self.visit(node.value),
             ),
         )
-        return a

eopsin/rewrite/rewrite_import.py

@@ -59,7 +59,7 @@ def visit_ImportFrom(
             node.names[0].name == "*"
         ), "The import must have the form 'from <pkg> import *'"
         assert (
-            node.names[0].asname == None
+            node.names[0].asname is None
         ), "The import must have the form 'from <pkg> import *'"
         # TODO set anchor point according to own package
         if self.filename:

eopsin/rewrite/rewrite_import_dataclasses.py

@@ -24,7 +24,7 @@ def visit_ImportFrom(self, node: ImportFrom) -> Optional[ImportFrom]:
                 node.names[i].name == n
             ), "The program must contain one 'from dataclasses import dataclass'"
             assert (
-                node.names[i].asname == None
+                node.names[i].asname is None
             ), "The program must contain one 'from dataclasses import dataclass'"
         self.imports_dataclasses = True
         return None

eopsin/rewrite/rewrite_import_plutusdata.py

@@ -29,7 +29,7 @@ def visit_ImportFrom(self, node: ImportFrom) -> Optional[ImportFrom]:
             node.names[1].name == "PlutusData"
         ), "The program must contain one 'from pycardano import Datum as Anything, PlutusData'"
         assert (
-            node.names[1].asname == None
+            node.names[1].asname is None
         ), "The program must contain one 'from pycardano import Datum as Anything, PlutusData'"
         self.imports_plutus_data = True
         return None

eopsin/rewrite/rewrite_import_typing.py

@@ -24,7 +24,7 @@ def visit_ImportFrom(self, node: ImportFrom) -> Optional[ImportFrom]:
                 node.names[i].name == n
             ), "The program must contain one 'from typing import Dict, List, Union'"
             assert (
-                node.names[i].asname == None
+                node.names[i].asname is None
             ), "The program must contain one 'from typing import Dict, List, Union'"
         self.imports_typing = True
         return None

eopsin/rewrite/rewrite_tuple_assign.py

@@ -19,17 +19,15 @@ def visit_Assign(self, node: Assign) -> typing.List[stmt]:
         uid = self.unique_id
         self.unique_id += 1
         assignments = [Assign([Name(f"{uid}_tup", Store())], self.visit(node.value))]
-        for i, t in enumerate(node.targets[0].elts):
-            assignments.append(
-                Assign(
-                    [t],
-                    Subscript(
-                        value=Name(f"{uid}_tup", Load()),
-                        slice=Index(value=Constant(i)),
-                        ctx=Load(),
-                    ),
-                )
+        assignments.extend(
+            Assign(
+                [t],
+                Subscript(
+                    value=Name(f"{uid}_tup", Load()),
+                    slice=Index(value=Constant(i)),
+                    ctx=Load(),
+                ),
             )
-        # recursively resolve multiple layers of tuples
-        transformed = sum([self.visit(a) for a in assignments], [])
-        return transformed
+            for i, t in enumerate(node.targets[0].elts)
+        )
+        return sum((self.visit(a) for a in assignments), [])

eopsin/tests/test_ledger/test_interval.py

@@ -139,8 +139,8 @@ def test_contains(a: POSIXTimeRange, b: POSIXTimeRange):
     lower = compare_lower_bound(a.lower_bound, b.lower_bound)
     upper = compare_upper_bound(a.upper_bound, b.upper_bound)
     if contains(a, b):
-        assert lower == 1 or lower == 0
-        assert upper == 0 or upper == -1
+        assert lower in [1, 0]
+        assert upper in [0, -1]
     else:
         assert lower == -1 or upper == 1
 
@@ -200,8 +200,5 @@ def test_fuzz_compare_extended_helper(time: ExtendedPOSIXTime) -> None:
 
 @given(b=st.booleans())
 def test_get_bool(b: bool) -> None:
-    if b:
-        bool_data = TrueData()
-    else:
-        bool_data = FalseData()
+    bool_data = TrueData() if b else FalseData()
     assert get_bool(bool_data) == b

eopsin/tests/test_stdlib.py

@@ -141,7 +141,7 @@ def validator(x: None) -> str:
         self.assertEqual(ret, xs, "literal string returned wrong value")
 
     def test_constant_unit(self):
-        source_code = f"""
+        source_code = """
 def validator(x: None) -> None:
     return None
             """

eopsin/type_inference.py

@@ -223,7 +223,6 @@ def visit_If(self, node: If) -> TypedIf:
         typed_if = copy(node)
         if (
             isinstance(typed_if.test, Call)
-            and (typed_if.test.func, Name)
             and typed_if.test.func.id == "isinstance"
         ):
             tc = typed_if.test
@@ -246,7 +245,7 @@ def visit_If(self, node: If) -> TypedIf:
             assert isinstance(target_class, RecordType), "Can only cast to PlutusData"
             assert (
                 target_class in target_inst_class.typ.typs
-            ), f"Trying to cast an instance of Union type to non-instance of union type"
+            ), "Trying to cast an instance of Union type to non-instance of union type"
             typed_if.test = self.visit(
                 Compare(
                     left=Attribute(tc.args[0], "CONSTR_ID"),
@@ -475,7 +474,7 @@ def visit_Subscript(self, node: Subscript) -> TypedSubscript:
         elif isinstance(ts.value.typ.typ, DictType):
             # TODO could be implemented with potentially just erroring. It might be desired to avoid this though.
             raise TypeInferenceError(
-                f"Could not infer type of subscript of dict. Use 'get' with a default value instead."
+                "Could not infer type of subscript of dict. Use 'get' with a default value instead."
             )
         else:
             raise TypeInferenceError(
@@ -517,8 +516,7 @@ def visit_Call(self, node: Call) -> TypedCall:
         raise TypeInferenceError("Could not infer type of call")
 
     def visit_Pass(self, node: Pass) -> TypedPass:
-        tp = copy(node)
-        return tp
+        return copy(node)
 
     def visit_Return(self, node: Return) -> TypedReturn:
         tp = copy(node)

eopsin/typed_ast.py

@@ -1041,7 +1041,7 @@ def empty_list(p: Type):
                 ),
             )
         )
-    if isinstance(p.typ, RecordType) or isinstance(p.typ, AnyType):
+    if isinstance(p.typ, (RecordType, AnyType)):
         return plt.EmptyDataList()
     raise NotImplementedError(f"Empty lists of type {p} can't be constructed yet")
 
@@ -1113,7 +1113,7 @@ def visit(self, node):
         node_class_name = node.__class__.__name__
         if node_class_name.startswith("Typed"):
             node_class_name = node_class_name[len("Typed") :]
-        method = "visit_" + node_class_name
+        method = f"visit_{node_class_name}"
         visitor = getattr(self, method, self.generic_visit)
         return visitor(node)
 
@@ -1124,6 +1124,6 @@ def visit(self, node):
         node_class_name = node.__class__.__name__
         if node_class_name.startswith("Typed"):
             node_class_name = node_class_name[len("Typed") :]
-        method = "visit_" + node_class_name
+        method = f"visit_{node_class_name}"
         visitor = getattr(self, method, self.generic_visit)
         return visitor(node)

examples/dict_datum.py

@@ -15,5 +15,5 @@ def validator(d: D2) -> bool:
     return (
         D(b"\x01") in d.dict_field.keys()
         and 2 in d.dict_field.values()
-        and not D(b"") in d.dict_field.keys()
+        and D(b"") not in d.dict_field.keys()
     )

examples/fib_rec.py

@@ -1,11 +1,10 @@
 def fib(n: int) -> int:
     if n == 0:
-        res = 0
+        return 0
     elif n == 1:
-        res = 1
+        return 1
     else:
-        res = fib(n - 1) + fib(n - 2)
-    return res
+        return fib(n - 1) + fib(n - 2)
 
 
 def validator(n: int) -> int:

examples/list_comprehensions.py

@@ -2,10 +2,8 @@
 
 
 def validator(n: int, even: bool) -> List[int]:
-    if even:
-        # generate even squares
-        res = [k * k for k in range(n) if k % 2 == 0]
-    else:
-        # generate all squares
-        res = [k * k for k in range(n)]
-    return res
+    return (
+        [k * k for k in range(n) if k % 2 == 0]
+        if even
+        else [k * k for k in range(n)]
+    )

examples/list_datum.py

@@ -7,4 +7,4 @@ class D2(PlutusData):
 
 
 def validator(d: D2) -> bool:
-    return b"\x01" == d.list_field[0]
+    return d.list_field[0] == b"\x01"

examples/mult_for.py

@@ -1,6 +1,2 @@
 def validator(a: int, b: int) -> int:
-    # trivial implementation of c = a * b
-    c = 0
-    for k in range(b):
-        c += a
-    return c
+    return sum(a for _ in range(b))

examples/mult_while.py

@@ -1,7 +1,7 @@
 def validator(a: int, b: int) -> int:
     # trivial implementation of c = a * b
     c = 0
-    while 0 < b:
+    while b > 0:
         c += a
         b -= 1
     return c

examples/showcase.py

@@ -10,7 +10,7 @@ def validator(n: int) -> int:
         a += 5
     while b < 5:
         b += 1
-    for i in range(2):
+    for _ in range(2):
         print("loop")
 
     # sha256, sha3_256 and blake2b