merge sync
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Mon, 03 Feb 2020 18:21:23 +0100
branchsync
changeset 4402b4dbd9d6f3d9
parent 4401 17a34a9d0a4c
parent 4399 0fdab811cf88
child 4403 b2a61953f3e2
merge
     1.1 --- a/sync/sync.fsm	Mon Feb 03 18:20:29 2020 +0100
     1.2 +++ b/sync/sync.fsm	Mon Feb 03 18:21:23 2020 +0100
     1.3 @@ -106,7 +106,7 @@
     1.4              }
     1.5  
     1.6              on Rollback {
     1.7 -                if sameNegotiationAndPartner
     1.8 +                if sameNegotiation
     1.9                      go Sole;
    1.10              }
    1.11  
    1.12 @@ -118,7 +118,7 @@
    1.13              }
    1.14  
    1.15              on CommitReject {
    1.16 -                if sameNegotiationAndPartner {
    1.17 +                if sameNegotiation {
    1.18                      do disable;
    1.19                      go End;
    1.20                  }
    1.21 @@ -133,7 +133,7 @@
    1.22  
    1.23              // got a CommitAccept from requester
    1.24              on CommitAcceptRequester {
    1.25 -                if sameNegotiationAndPartner
    1.26 +                if sameNegotiation
    1.27                      go HandshakingPhase2Offerer;
    1.28              }
    1.29          }
    1.30 @@ -150,7 +150,7 @@
    1.31              }
    1.32  
    1.33              on Rollback {
    1.34 -                if sameNegotiationAndPartner
    1.35 +                if sameNegotiation
    1.36                      go Sole;
    1.37              }
    1.38  
    1.39 @@ -162,7 +162,7 @@
    1.40              }
    1.41  
    1.42              on CommitReject {
    1.43 -                if sameNegotiationAndPartner {
    1.44 +                if sameNegotiation {
    1.45                      do disable;
    1.46                      go End;
    1.47                  }
    1.48 @@ -177,21 +177,21 @@
    1.49  
    1.50              // got a CommitAccept from offerer
    1.51              on CommitAcceptOfferer {
    1.52 -                if sameNegotiationAndPartner
    1.53 +                if sameNegotiation
    1.54                      go HandshakingPhase2Requester;
    1.55              }
    1.56          }
    1.57  
    1.58          state HandshakingPhase1Offerer {
    1.59              on Rollback {
    1.60 -                if sameNegotiationAndPartner {
    1.61 +                if sameNegotiation {
    1.62                      do untrustThisKey;
    1.63                      go Sole;
    1.64                  }
    1.65              }
    1.66              
    1.67              on CommitReject {
    1.68 -                if sameNegotiationAndPartner {
    1.69 +                if sameNegotiation {
    1.70                      do untrustThisKey;
    1.71                      do disable;
    1.72                      go End;
    1.73 @@ -199,21 +199,21 @@
    1.74              }
    1.75  
    1.76              on CommitAcceptRequester {
    1.77 -                if sameNegotiationAndPartner
    1.78 +                if sameNegotiation
    1.79                      go FormingGroupOfferer;
    1.80              }
    1.81          }
    1.82  
    1.83          state HandshakingPhase1Requester {
    1.84              on Rollback {
    1.85 -                if sameNegotiationAndPartner {
    1.86 +                if sameNegotiation {
    1.87                      do untrustThisKey;
    1.88                      go Sole;
    1.89                  }
    1.90              }
    1.91              
    1.92              on CommitReject {
    1.93 -                if sameNegotiationAndPartner {
    1.94 +                if sameNegotiation {
    1.95                      do untrustThisKey;
    1.96                      do disable;
    1.97                      go End;
    1.98 @@ -221,7 +221,7 @@
    1.99              }
   1.100  
   1.101              on CommitAcceptOfferer {
   1.102 -                if sameNegotiationAndPartner
   1.103 +                if sameNegotiation
   1.104                      go FormingGroupRequester;
   1.105              }
   1.106          }
   1.107 @@ -397,7 +397,7 @@
   1.108              }
   1.109  
   1.110              on Rollback {
   1.111 -                if sameNegotiationAndPartner
   1.112 +                if sameNegotiation
   1.113                      go Sole;
   1.114              }
   1.115  
   1.116 @@ -409,12 +409,12 @@
   1.117              }
   1.118  
   1.119              on CommitAcceptForGroup {
   1.120 -                if sameNegotiationAndPartner
   1.121 +                if sameNegotiation
   1.122                      go HandshakingToJoinPhase2;
   1.123              }
   1.124  
   1.125              on CommitReject {
   1.126 -                if sameNegotiationAndPartner {
   1.127 +                if sameNegotiation {
   1.128                      do disable;
   1.129                      go End;
   1.130                  }
   1.131 @@ -430,19 +430,19 @@
   1.132  
   1.133          state HandshakingToJoinPhase1 {
   1.134              on Rollback {
   1.135 -                if sameNegotiationAndPartner
   1.136 +                if sameNegotiation
   1.137                      go Sole;
   1.138              }
   1.139  
   1.140              on CommitReject {
   1.141 -                if sameNegotiationAndPartner {
   1.142 +                if sameNegotiation {
   1.143                      do disable;
   1.144                      go End;
   1.145                  }
   1.146              }
   1.147  
   1.148              on CommitAcceptForGroup {
   1.149 -                if sameNegotiationAndPartner
   1.150 +                if sameNegotiation
   1.151                      go JoiningGroup;
   1.152              }
   1.153          }
   1.154 @@ -490,7 +490,7 @@
   1.155              }
   1.156  
   1.157              on Rollback {
   1.158 -                if sameNegotiationAndPartner
   1.159 +                if sameNegotiation
   1.160                      go Grouped;
   1.161              }
   1.162  
   1.163 @@ -501,7 +501,7 @@
   1.164              }
   1.165  
   1.166              on CommitReject {
   1.167 -                if sameNegotiationAndPartner
   1.168 +                if sameNegotiation
   1.169                      go Grouped;
   1.170              }
   1.171  
   1.172 @@ -512,7 +512,7 @@
   1.173              }
   1.174  
   1.175              on CommitAccept {
   1.176 -                if sameNegotiationAndPartner
   1.177 +                if sameNegotiation
   1.178                      go HandshakingGroupedPhase2;
   1.179              }
   1.180  
   1.181 @@ -537,17 +537,17 @@
   1.182              }
   1.183  
   1.184              on Rollback {
   1.185 -                if sameNegotiationAndPartner
   1.186 +                if sameNegotiation
   1.187                      go Grouped;
   1.188              }
   1.189  
   1.190              on CommitReject {
   1.191 -                if sameNegotiationAndPartner
   1.192 +                if sameNegotiation
   1.193                      go Grouped;
   1.194              }
   1.195  
   1.196              on CommitAccept {
   1.197 -                if sameNegotiationAndPartner {
   1.198 +                if sameNegotiation {
   1.199                      do prepareOwnKeys;
   1.200                      send GroupKeysForNewMember;
   1.201                      do showDeviceAccepted;