From: <xr...@us...> - 2016-01-12 15:39:54
|
Revision: 1909 http://sourceforge.net/p/scstudio/code/1909 Author: xrehak Date: 2016-01-12 15:39:52 +0000 (Tue, 12 Jan 2016) Log Message: ----------- Repair of the tests/race/race_pos_2_actions.vsd Both new race_pos_2_actions and race_pos_3_action_small added to time/time_race. Modified Paths: -------------- trunk/tests/race/race_pos_2_actions.vsd trunk/tests/time/time_race/CMakeLists.txt Added Paths: ----------- trunk/tests/time/time_race/race_pos_2_actions.mpr trunk/tests/time/time_race/race_pos_2_actions.vsd trunk/tests/time/time_race/race_pos_3_action_small.mpr trunk/tests/time/time_race/race_pos_3_action_small.vsd Modified: trunk/tests/race/race_pos_2_actions.vsd =================================================================== (Binary files differ) Modified: trunk/tests/time/time_race/CMakeLists.txt =================================================================== --- trunk/tests/time/time_race/CMakeLists.txt 2016-01-12 15:22:19 UTC (rev 1908) +++ trunk/tests/time/time_race/CMakeLists.txt 2016-01-12 15:39:52 UTC (rev 1909) @@ -44,3 +44,8 @@ ADD_CHECKER_TEST(sctime "Time Race" race_cond_neg1.mpr 0) ADD_CHECKER_TEST(sctime "Time Race" race_cond_neg2.mpr 0) + + +ADD_CHECKER_TEST(sctime "Time Race" race_pos_2_actions.mpr 1) +ADD_CHECKER_TEST(sctime "Time Race" race_pos_3_action_small.mpr 1) + Added: trunk/tests/time/time_race/race_pos_2_actions.mpr =================================================================== --- trunk/tests/time/time_race/race_pos_2_actions.mpr (rev 0) +++ trunk/tests/time/time_race/race_pos_2_actions.mpr 2016-01-12 15:39:52 UTC (rev 1909) @@ -0,0 +1,59 @@ +mscdocument actions_failure.vsd; +msc Stranka_1; +inst Alice; +inst Bob; +inst Public_network_blockchains; +text 'The one who has lower `px` generates `x`. Let us WLOG assume it is Bob.'; +Alice: instance; +out Order_publish,0 to Public_network_blockchains; +in Proposes_a_trade_sends_hash_px_,1 from Bob; +action 'Generates_px_'; +out Accepts_proposal_sends_hash_px_,2 to Bob; +in Sends_px_,3 from Bob; +out Sends_px_,4 to Bob; +in Sends_pubkey_and_hash_x_,5 from Bob; +action 'Generates_new_key_pair'; +out Sends_pubkey,6 to Bob; +in Sends_request_for_signing_tx2_,7 from Bob; +action 'Verifies_tx2_and_signs_it'; +out Sends_signature_for_tx2_,8 to Bob; +in _tx1_is_verified_and_safely_stored_in_its_blockchain,9 from Public_network_blockchains; +action 'Generates_tx3_tx4_'; +out Sends_request_for_signing_tx4_,10 to Bob; +in Sends_signature_for_tx4_,11 from Bob; +out Broadcasts_tx3_,12 to Public_network_blockchains; +in Spots_tx5_and_extracts_x_,13 from Public_network_blockchains; +out Claims_funds_from_tx1_using_x_in_tx6_,14 to Public_network_blockchains; +endinstance; +Bob: instance; +in Order_read,15 from Public_network_blockchains; +action 'Generates_px_'; +out Proposes_a_trade_sends_hash_px_,1 to Alice; +in Accepts_proposal_sends_hash_px_,2 from Alice; +out Sends_px_,3 to Alice; +in Sends_px_,4 from Alice; +action 'Generates_new_key_pair'; +out Sends_pubkey_and_hash_x_,5 to Alice; +in Sends_pubkey,6 from Alice; +action 'Generates_tx1_tx2_'; +out Sends_request_for_signing_tx2_,7 to Alice; +in Sends_signature_for_tx2_,8 from Alice; +out Broadcasts_tx1_,16 to Public_network_blockchains; +in Sends_request_for_signing_tx4_,10 from Alice; +action 'Verifies_tx4_and_signs_it'; +out Sends_signature_for_tx4_,11 to Alice; +in _tx3_is_verified_and_safely_stored_in_its_blockchain,17 from Public_network_blockchains; +out Claims_funds_from_tx3_by_revealing_x_in_tx5_,18 to Public_network_blockchains; +endinstance; +Public_network_blockchains: instance; +in Order_publish,0 from Alice; +out Order_read,15 to Bob; +in Broadcasts_tx1_,16 from Bob; +out _tx1_is_verified_and_safely_stored_in_its_blockchain,9 to Alice; +in Broadcasts_tx3_,12 from Alice; +out _tx3_is_verified_and_safely_stored_in_its_blockchain,17 to Bob; +in Claims_funds_from_tx3_by_revealing_x_in_tx5_,18 from Bob; +out Spots_tx5_and_extracts_x_,13 to Alice; +in Claims_funds_from_tx1_using_x_in_tx6_,14 from Alice; +endinstance; +endmsc; Added: trunk/tests/time/time_race/race_pos_2_actions.vsd =================================================================== (Binary files differ) Index: trunk/tests/time/time_race/race_pos_2_actions.vsd =================================================================== --- trunk/tests/time/time_race/race_pos_2_actions.vsd 2016-01-12 15:22:19 UTC (rev 1908) +++ trunk/tests/time/time_race/race_pos_2_actions.vsd 2016-01-12 15:39:52 UTC (rev 1909) Property changes on: trunk/tests/time/time_race/race_pos_2_actions.vsd ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/vsd \ No newline at end of property Added: trunk/tests/time/time_race/race_pos_3_action_small.mpr =================================================================== --- trunk/tests/time/time_race/race_pos_3_action_small.mpr (rev 0) +++ trunk/tests/time/time_race/race_pos_3_action_small.mpr 2016-01-12 15:39:52 UTC (rev 1909) @@ -0,0 +1,17 @@ +mscdocument actions_failure_small.vsd; +msc Stranka_1; +inst Alice; +inst Bob; +inst Public_network_blockchains; +Alice: instance; +out Order_publish,0 to Public_network_blockchains; +endinstance; +Bob: instance; +in Order_read,1 from Public_network_blockchains; +action 'Generates_px_'; +endinstance; +Public_network_blockchains: instance; +in Order_publish,0 from Alice; +out Order_read,1 to Bob; +endinstance; +endmsc; Added: trunk/tests/time/time_race/race_pos_3_action_small.vsd =================================================================== (Binary files differ) Index: trunk/tests/time/time_race/race_pos_3_action_small.vsd =================================================================== --- trunk/tests/time/time_race/race_pos_3_action_small.vsd 2016-01-12 15:22:19 UTC (rev 1908) +++ trunk/tests/time/time_race/race_pos_3_action_small.vsd 2016-01-12 15:39:52 UTC (rev 1909) Property changes on: trunk/tests/time/time_race/race_pos_3_action_small.vsd ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/vsd \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |