From 3c5b91e3e368f245a3ba72d61ddb5611286d1f60 Mon Sep 17 00:00:00 2001 From: ccremers Date: Fri, 11 Mar 2005 20:27:57 +0000 Subject: [PATCH] - Code cleanup. --- test/multiprotocoltest.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/multiprotocoltest.py b/test/multiprotocoltest.py index dff528c..d21085a 100755 --- a/test/multiprotocoltest.py +++ b/test/multiprotocoltest.py @@ -298,14 +298,15 @@ def DescribeContext (filep, protocols, claim): # returns 1 if it really requires these protocols # def RequiresAllProtocols (protocols, claim): + # check for single results if ClaimToResultMap[claim] == 0: - # claim was always false - return 0 + # claim was always false (already attack on single prot.) + return False # check for simple cases if TupleWidth <= 2: # nothing to remove - return 1 + return True # test the claims when removing some others # for TupleWidth size list, we can remove TupleWidth-1 @@ -321,8 +322,8 @@ def RequiresAllProtocols (protocols, claim): simplerresults = ScytherEval (simplercase) if claim in simplerresults.keys() and simplerresults[claim] == 0: # Redundant protocol was not necessary for attack! - return 0 - return 1 + return False + return True @@ -334,7 +335,7 @@ def RequiresAllProtocols (protocols, claim): # Returns number of new attacks found # def SignalAttack (protocols, claim): - if RequiresAllProtocols (protocols, claim) == 0: + if not RequiresAllProtocols (protocols, claim): return 0 ClearProgress (TupleCount, safetxt)