@@ -29,10 +29,8 @@ func RunReshareDKG(ctx context.Context, config *Config, board *Board, shares []s
2929
3030 // Validate that AddedPeers and RemovedPeers are disjoint sets
3131 for _ , addedPeer := range config .Reshare .AddedPeers {
32- for _ , removedPeer := range config .Reshare .RemovedPeers {
33- if addedPeer == removedPeer {
34- return nil , errors .New ("peer cannot be both added and removed" , z .Any ("peer_id" , addedPeer ))
35- }
32+ if slices .Contains (config .Reshare .RemovedPeers , addedPeer ) {
33+ return nil , errors .New ("peer cannot be both added and removed" , z .Any ("peer_id" , addedPeer ))
3634 }
3735 }
3836
@@ -126,6 +124,7 @@ func RunReshareDKG(ctx context.Context, config *Config, board *Board, shares []s
126124 for _ , removedPeerID := range config .Reshare .RemovedPeers {
127125 if idx , ok := config .PeerMap [removedPeerID ]; ok && idx .PeerIdx == int (node .Index ) {
128126 isRemoving = true
127+
129128 if idx .PeerIdx == thisNodeIndex {
130129 thisIsRemovedNode = true
131130 }
@@ -138,6 +137,7 @@ func RunReshareDKG(ctx context.Context, config *Config, board *Board, shares []s
138137 for _ , addedPeerID := range config .Reshare .AddedPeers {
139138 if idx , ok := config .PeerMap [addedPeerID ]; ok && idx .PeerIdx == int (node .Index ) {
140139 isNewlyAdded = true
140+
141141 if idx .PeerIdx == thisNodeIndex {
142142 thisIsAddedNode = true
143143 }
0 commit comments