Merge branch 'master' into refactor/ctx_add_instruction_and_friends

vyperlang · Dec 8, 2023 · b8ae7bf · b8ae7bf
2 parents cefe061 + 21a47b6
commit b8ae7bf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/tests/functional/codegen/integration/test_crowdfund.py b/tests/functional/codegen/integration/test_crowdfund.py
@@ -63,10 +63,13 @@ def refund():
 
     """
     a0, a1, a2, a3, a4, a5, a6 = w3.eth.accounts[:7]
+
     c = get_contract_with_gas_estimation_for_constants(crowdfund, *[a1, 50, 60])
+    start_timestamp = w3.eth.get_block(w3.eth.block_number).timestamp
+
     c.participate(transact={"value": 5})
     assert c.timelimit() == 60
-    assert c.deadline() - c.block_timestamp() == 59
+    assert c.deadline() - start_timestamp == 60
     assert not c.expired()
     assert not c.reached()
     c.participate(transact={"value": 49})

diff --git a/...compiler/venom/test_duplicate_operands.py → ...compiler/venom/test_duplicate_operands.py b/...compiler/venom/test_duplicate_operands.py → ...compiler/venom/test_duplicate_operands.py
diff --git a/.../compiler/venom/test_multi_entry_block.py → .../compiler/venom/test_multi_entry_block.py b/.../compiler/venom/test_multi_entry_block.py → .../compiler/venom/test_multi_entry_block.py
diff --git a/...er/venom/test_stack_at_external_return.py → ...er/venom/test_stack_at_external_return.py b/...er/venom/test_stack_at_external_return.py → ...er/venom/test_stack_at_external_return.py