Use eth-tester.

setup.py

@@ -22,8 +22,8 @@
     url='https://github.com/ethereum/vyper',
     license=license,
     packages=find_packages(exclude=('tests', 'docs')),
-    install_requires=['py-evm>=0.2.0a12'],
+    install_requires=['py-evm==0.2.0a16'],
     setup_requires=['pytest-runner'],
-    tests_require=['pytest', 'pytest-cov', 'ethereum==2.3.1'],
+    tests_require=['pytest', 'pytest-cov', 'eth-tester==0.1.0b24'],
     scripts=['bin/vyper', 'bin/vyper-serve', 'bin/vyper-run']
 )

tests/compiler/LLL/test_compile_lll.py

@@ -35,3 +35,19 @@ def test_lll_compile_fail(bad_lll, get_contract_from_lll, assert_compile_failed)
 @pytest.mark.parametrize('good_lll', valid_list)
 def test_compile_lll_good(good_lll, get_contract_from_lll):
     get_contract_from_lll(LLLnode.from_list(good_lll))
+
+
+def test_ninja(get_contract_from_lll):
+
+    ninja_lll = LLLnode.from_list(
+        ['seq',
+          ['return',
+            0,
+            ['lll',
+              ['seq',
+                  ['calldatacopy', 0, 4, 32],
+                  ['return', 0, 32],
+                  'stop'
+                ],
+              0]]])
+    c = get_contract_from_lll(ninja_lll)

tests/compiler/LLL/test_repeat.py

@@ -1,6 +1,6 @@
 
 
-def test_repeat(t, get_contract_from_lll, assert_compile_failed):
+def test_repeat(get_contract_from_lll, assert_compile_failed):
     good_lll = ['repeat', 0, 0, 1, ['seq']]
     bad_lll_1 = ['repeat', 0, 0, 0, ['seq']]
     bad_lll_2 = ['repeat', 0, 0, -1, ['seq']]

tests/compiler/LLL/test_with.py

@@ -1,6 +1,6 @@
 
 
-def test_with_depth(t, get_contract_from_lll, assert_compile_failed):
+def test_with_depth(get_contract_from_lll, assert_compile_failed):
     _16_with_statements = ['with', 'var_1', 0,
                           ['with', 'var_2', 0,
                           ['with', 'var_3', 0,
@@ -37,7 +37,7 @@ def test_with_depth(t, get_contract_from_lll, assert_compile_failed):
     assert_compile_failed(lambda: get_contract_from_lll(_17_with_statements), Exception)
 
 
-def test_with_set_depth(t, get_contract_from_lll, assert_compile_failed):
+def test_with_set_depth(get_contract_from_lll, assert_compile_failed):
     _16_with_statements = ['with', 'var_1', 0,
                           ['with', 'var_2', 0,
                           ['with', 'var_3', 0,

tests/compiler/test_clamps.py

@@ -1,6 +1,6 @@
 
 
-def test_uclamplt(t, get_contract_from_lll, assert_compile_failed):
+def test_uclamplt(get_contract_from_lll, assert_compile_failed):
     lll = ['uclamplt', 2, 1]
     assert_compile_failed(lambda: get_contract_from_lll(lll), Exception)
     lll = ['uclamplt', 1, 1]
@@ -9,7 +9,7 @@ def test_uclamplt(t, get_contract_from_lll, assert_compile_failed):
     get_contract_from_lll(lll)
 
 
-def test_uclample(t, get_contract_from_lll, assert_compile_failed):
+def test_uclample(get_contract_from_lll, assert_compile_failed):
     lll = ['uclample', 2, 1]
     assert_compile_failed(lambda: get_contract_from_lll(lll), Exception)
     lll = ['uclample', 1, 1]
@@ -18,7 +18,7 @@ def test_uclample(t, get_contract_from_lll, assert_compile_failed):
     get_contract_from_lll(lll)
 
 
-def test_uclampgt(t, get_contract_from_lll, assert_compile_failed):
+def test_uclampgt(get_contract_from_lll, assert_compile_failed):
     lll = ['uclampgt', 1, 2]
     assert_compile_failed(lambda: get_contract_from_lll(lll), Exception)
     lll = ['uclampgt', 1, 1]
@@ -27,7 +27,7 @@ def test_uclampgt(t, get_contract_from_lll, assert_compile_failed):
     get_contract_from_lll(lll)
 
 
-def test_uclampge(t, get_contract_from_lll, assert_compile_failed):
+def test_uclampge(get_contract_from_lll, assert_compile_failed):
     lll = ['uclampge', 1, 2]
     assert_compile_failed(lambda: get_contract_from_lll(lll), Exception)
     lll = ['uclampge', 1, 1]
@@ -36,7 +36,7 @@ def test_uclampge(t, get_contract_from_lll, assert_compile_failed):
     get_contract_from_lll(lll)
 
 
-def test_uclamplt_and_clamplt(t, get_contract_from_lll, assert_compile_failed):
+def test_uclamplt_and_clamplt(get_contract_from_lll, assert_compile_failed):
     lll = ['uclamplt', 2, 1]
     assert_compile_failed(lambda: get_contract_from_lll(lll), Exception)
     lll = ['uclamplt', 1, 1]
@@ -51,7 +51,7 @@ def test_uclamplt_and_clamplt(t, get_contract_from_lll, assert_compile_failed):
     get_contract_from_lll(lll)
 
 
-def test_uclample_clample(t, get_contract_from_lll, assert_compile_failed):
+def test_uclample_clample(get_contract_from_lll, assert_compile_failed):
     lll = ['uclample', 2, 1]
     assert_compile_failed(lambda: get_contract_from_lll(lll), Exception)
     lll = ['uclample', 1, 1]
@@ -66,7 +66,7 @@ def test_uclample_clample(t, get_contract_from_lll, assert_compile_failed):
     get_contract_from_lll(lll)
 
 
-def test_uclampgt_and_clampgt(t, get_contract_from_lll, assert_compile_failed):
+def test_uclampgt_and_clampgt(get_contract_from_lll, assert_compile_failed):
     lll = ['uclampgt', 1, 2]
     assert_compile_failed(lambda: get_contract_from_lll(lll), Exception)
     lll = ['uclampgt', 1, 1]
@@ -81,7 +81,7 @@ def test_uclampgt_and_clampgt(t, get_contract_from_lll, assert_compile_failed):
     get_contract_from_lll(lll)
 
 
-def test_uclampge_and_clampge(t, get_contract_from_lll, assert_compile_failed):
+def test_uclampge_and_clampge(get_contract_from_lll, assert_compile_failed):
     lll = ['uclampge', 1, 2]
     assert_compile_failed(lambda: get_contract_from_lll(lll), Exception)
     lll = ['uclampge', 1, 1]