remove replacementpool

qa/cryptoconditions/test_integration.py

@@ -4,7 +4,6 @@ import json
 import logging
 import binascii
 import struct
-import base64
 from testsupport import *
 
 
@@ -91,7 +90,91 @@ def test_oversize_fulfillment(inp):
         assert 'scriptsig-size' in str(e), str(e)
 
 
+@fanout_input(6)
+def test_aux_basic(inp):
+    aux_cond = {
+        'type': 'aux-sha-256',
+        'method': 'equals',
+        'conditionAux': 'LTE',
+        'fulfillmentAux': 'LTE'
+    }
+
+    # Setup some aux outputs
+    spend0 = {
+        'inputs': [inp],
+        'outputs': [
+            {'amount': 500, 'script': {'condition': aux_cond}},
+            {'amount': 500, 'script': {'condition': aux_cond}}
+        ]
+    }
+    spend0_txid = submit(sign(spend0))
+    assert rpc.getrawtransaction(spend0_txid)
+
+    # Test a good fulfillment
+    spend1 = {
+        'inputs': [{'txid': spend0_txid, 'idx': 0, 'script': {'fulfillment': aux_cond}}],
+        'outputs': [{'amount': 500, 'script': {'condition': aux_cond}}]
+    }
+    spend1_txid = submit(sign(spend1))
+    assert rpc.getrawtransaction(spend1_txid)
+
+    # Test a bad fulfillment
+    aux_cond['fulfillmentAux'] = 'WYW'
+    spend2 = {
+        'inputs': [{'txid': spend0_txid, 'idx': 1, 'script': {'fulfillment': aux_cond}}],
+        'outputs': [{'amount': 500, 'script': {'condition': aux_cond}}]
+    }
+    try:
+        assert not submit(sign(spend2)), 'should raise an error'
+    except RPCError as e:
+        assert SCRIPT_FALSE in str(e), str(e)
+
+
 @fanout_input(7)
+def test_aux_complex(inp):
+    aux_cond = {
+        'type': 'aux-sha-256',
+        'method': 'inputIsReturn',
+        'conditionAux': '',
+        'fulfillmentAux': 'AQ' # \1 (tx.vout[1])
+    }
+
+    # Setup some aux outputs
+    spend0 = {
+        'inputs': [inp],
+        'outputs': [
+            {'amount': 500, 'script': {'condition': aux_cond}},
+            {'amount': 500, 'script': {'condition': aux_cond}}
+        ]
+    }
+    spend0_txid = submit(sign(spend0))
+    assert rpc.getrawtransaction(spend0_txid)
+
+    # Test a good fulfillment
+    spend1 = {
+        'inputs': [{'txid': spend0_txid, 'idx': 0, 'script': {'fulfillment': aux_cond}}],
+        'outputs': [
+            {'amount': 250, 'script': {'condition': aux_cond}},
+            {'amount': 250, 'script': "6A0B68656C6C6F207468657265"} # OP_RETURN somedata
+        ]
+    }
+    spend1_txid = submit(sign(spend1))
+    assert rpc.getrawtransaction(spend1_txid)
+
+    # Test a bad fulfillment
+    spend2 = {
+        'inputs': [{'txid': spend0_txid, 'idx': 1, 'script': {'fulfillment': aux_cond}}],
+        'outputs': [
+            {'amount': 500, 'script': "6A0B68656C6C6F207468657265"} # OP_RETURN somedata
+        ]
+    }
+    try:
+        assert not submit(sign(spend2)), 'should raise an error'
+    except RPCError as e:
+        assert SCRIPT_FALSE in str(e), str(e)
+
+
+@fanout_input(8)
 def test_secp256k1_condition(inp):
     ec_cond = {
         'type': 'secp256k1-sha-256',
@@ -130,6 +213,7 @@ def test_secp256k1_condition(inp):
     except RPCError as e:
         assert SCRIPT_FALSE in str(e), str(e)
 
+
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
     for name, f in globals().items():

qa/cryptoconditions/testsupport.py

@@ -32,7 +32,7 @@ class JsonClient(object):
 
 def run_cmd(cmd):
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-    assert proc.wait() == 0, cmd
+    assert proc.wait() == 0
     return proc.stdout.read()
 
 
@@ -68,7 +68,7 @@ def wait_for_block(height):
         try:
             return rpc.getblock(str(height))
         except RPCError as e:
-            time.sleep(1)
+            time.sleep(3)
     raise Exception('Time out waiting for block at height %s' % height)
 
 
@@ -97,7 +97,7 @@ def get_fanout_txid():
     reward_tx = hoek.decodeTx({'hex': reward_tx_raw})
     balance = reward_tx['outputs'][0]['amount']
 
-    n_outs = 40
+    n_outs = 16
     remainder = balance - n_outs * 1000
 
     fanout = {
@@ -109,9 +109,7 @@ def get_fanout_txid():
         ] + [{"amount": remainder, 'script': {'address': notary_addr}}])
     }
 
-    txid = submit(sign(fanout))
-    rpc.getrawtransaction(txid)
-    return txid
+    return submit(sign(fanout))
 
 
 def fanout_input(n):