@Gricha - one of the rules of agile programming - don't add placehold…

…er classes, don't anticipate. if you don't implement conditions yet, don't create placeholder classes.

reasons for that:
- agile projects often pivot, and you end up with a code full of placeholders that won't get ever used
- placeholders make code harder to read, so there's a recurring cost to having them
- the architecture may change before we get to implementing a given feature, and placeholder might not fit the new architecture

I know we were two steps away from creating the conditions, but still - you should've waited with implementing the condition evaluator until the day you're building the conditions. **and even then** not create a separate class for that (because again - that's anticipating that future conditions will appear), but do it inline first, and once you see the code duplicated, move to create separate functions, and then finally - classes.

If you do it another way (and you are doing it the other way around consistently), you end up with a code filled with empty classes, that's very hard to maintain and modify.

src/oracle/handlers/conditionedtransactionhandler.py

@@ -1,5 +1,4 @@
 from basehandler import BaseHandler
-from oracle.condition_evaluator.evaluator import Evaluator
 from oracle.oracle_db import SignedTransaction, HandledTransaction, UsedInput
 from oracle.oracle_protocol import SUBJECT, RESPONSE
 
@@ -18,29 +17,19 @@ class TransactionVerificationError(Exception):
 class ConditionedTransactionHandler(BaseHandler):
   def __init__(self, oracle):
     self.oracle = oracle
-    self.evaluator = Evaluator()
 
   def handle_task(self, task):
     body = json.loads(task['json_data'])
-    condition = body['condition']
     transactions = body['transactions']
 
-    permissions_to_sign = self.evaluator.permissions_to_sign(condition, transactions)
-
-    if sum(permissions_to_sign) == 0:
-      logging.debug('no signatures for tx')
-      self.oracle.task_queue.done(task)
-      return
-
     for idx, tx in enumerate(transactions):
-      if permissions_to_sign[idx]:
-        transaction = tx['raw_transaction']
-        prevtx = tx['prevtx']
-        signed_transaction = self.oracle.btc.sign_transaction(transaction, prevtx)
-        body['transactions'][idx]['raw_transaction'] = signed_transaction
-        SignedTransaction(self.oracle.db).save({
-            "hex_transaction": signed_transaction,
-            "prevtx":json.dumps(prevtx)})
+      transaction = tx['raw_transaction']
+      prevtx = tx['prevtx']
+      signed_transaction = self.oracle.btc.sign_transaction(transaction, prevtx)
+      body['transactions'][idx]['raw_transaction'] = signed_transaction
+      SignedTransaction(self.oracle.db).save({
+          "hex_transaction": signed_transaction,
+          "prevtx":json.dumps(prevtx)})
 
     self.oracle.communication.broadcast_signed_transaction(json.dumps(body))
     self.oracle.task_queue.done(task)
@@ -177,12 +166,6 @@ def add_transaction(self, message):
       logging.debug("locktime must be a number")
       return
 
-    condition = body['condition']
-    # Future reference - add parsing condition. Now assumed true
-    if not self.evaluator.valid(condition):
-      logging.debug("condition invalid")
-      return
-
     try:
       self.oracle.btc.add_multisig_address(req_sigs, pubkey_list)
     except ProtocolError:

src/oracle/oracle_protocol.py

@@ -32,7 +32,7 @@ class SUBJECT:
 }
 
 OPERATION_REQUIRED_FIELDS = {
-    OPERATION.TRANSACTION: ['transactions', 'locktime', 'condition', 'pubkey_json', 'req_sigs'],
+    OPERATION.TRANSACTION: ['transactions', 'locktime', 'pubkey_json', 'req_sigs'],
     OPERATION.BOUNTY_CREATE: ['prevtx', 'locktime', 'message_id', 'sum_amount', 'miners_fee', 'oracle_fees', 'pubkey_json', 'req_sigs', 'password_hash', 'return_address'],
     OPERATION.GUESS_PASSWORD: ['pwtxid', 'passwords']
 }