From 4bd885f344c57bf5b2d2a1fb1e8a732b08efd8f0 Mon Sep 17 00:00:00 2001
From: Nils Gillmann <ng0@n0.is>
Date: Thu, 17 May 2018 15:37:57 +0000
Subject: [PATCH] follow-up, indentation fixes.

Signed-off-by: Nils Gillmann <ng0@n0.is>
---
 src/consensus/consensus-simulation.py.in | 143 ++++++++++++-----------
 1 file changed, 72 insertions(+), 71 deletions(-)

diff --git a/src/consensus/consensus-simulation.py.in b/src/consensus/consensus-simulation.py.in
index fbad9f678..12bef871d 100644
--- a/src/consensus/consensus-simulation.py.in
+++ b/src/consensus/consensus-simulation.py.in
@@ -25,82 +25,83 @@ from math import ceil, log, floor
 
 
 def bsc(n):
-  """ count the bits set in n"""
-  l = n.bit_length()
-  c = 0
-  x = 1
-  for _ in range(0, l):
-    if n & x:
-      c = c + 1
-    x = x << 1
-  return c
+    """ count the bits set in n"""
+    l = n.bit_length()
+    c = 0
+    x = 1
+    for _ in range(0, l):
+        if n & x:
+            c = c + 1
+        x = x << 1
+    return c
 
 
 def simulate(k, n, verbose):
-  assert k < n
-  largest_arc = int(2**ceil(log(n, 2))) / 2
-  num_ghosts = (2 * largest_arc) - n
-  if verbose:
-    print("we have", num_ghosts, "ghost peers")
-  # n.b. all peers with idx<k are evil
-  peers = range(n)
-  info = [1 << x for x in xrange(n)]
-  def done_p():
-    for x in xrange(k, n):
-      if bsc(info[x]) < n-k:
-        return False
-    return True
-  rounds = 0
-  while not done_p():
+    assert k < n
+    largest_arc = int(2**ceil(log(n, 2))) / 2
+    num_ghosts = (2 * largest_arc) - n
     if verbose:
-      print("-- round --")
-    arc = 1
-    while arc <= largest_arc:
-      if verbose:
-        print("-- subround --")
-      new_info = [x for x in info]
-      for peer_physical in xrange(n):
-        peer_logical = peers[peer_physical]
-        peer_type = None
-        partner_logical = (peer_logical + arc) % n
-        partner_physical = peers.index(partner_logical)
-        if peer_physical < k or partner_physical < k:
-          if verbose:
-            print("bad peer in connection", peer_physical, "--", partner_physical)
-          continue
-        if peer_logical & arc == 0:
-          # we are outgoing
-          if verbose:
-            print(peer_physical, "connects to", partner_physical)
-          peer_type = "outgoing"
-          if peer_logical < num_ghosts:
-            # we have a ghost, check if the peer who connects
-            # to our ghost is actually outgoing
-            ghost_partner_logical = (peer_logical - arc) % n
-            if ghost_partner_logical & arc == 0:
-              peer_type = peer_type + ", ghost incoming"
-          new_info[peer_physical] = new_info[peer_physical] | info[peer_physical] | info[partner_physical]
-          new_info[partner_physical] = new_info[partner_physical] | info[peer_physical] | info[partner_physical]
-        else:
-          peer_type = "incoming"
-        if verbose > 1:
-          print("type of", str(peer_physical) + ":", peer_type)
-      info = new_info
-      arc = arc << 1
-    rounds = rounds + 1
-    random.shuffle(peers)
-  return rounds
+        print("we have", num_ghosts, "ghost peers")
+        # n.b. all peers with idx<k are evil
+    peers = range(n)
+    info = [1 << x for x in xrange(n)]
+
+    def done_p():
+        for x in xrange(k, n):
+            if bsc(info[x]) < n-k:
+                return False
+        return True
+    rounds = 0
+    while not done_p():
+        if verbose:
+            print("-- round --")
+        arc = 1
+        while arc <= largest_arc:
+            if verbose:
+                print("-- subround --")
+            new_info = [x for x in info]
+            for peer_physical in xrange(n):
+                peer_logical = peers[peer_physical]
+                peer_type = None
+                partner_logical = (peer_logical + arc) % n
+                partner_physical = peers.index(partner_logical)
+                if peer_physical < k or partner_physical < k:
+                    if verbose:
+                        print("bad peer in connection", peer_physical, "--", partner_physical)
+                    continue
+                if peer_logical & arc == 0:
+                    # we are outgoing
+                    if verbose:
+                        print(peer_physical, "connects to", partner_physical)
+                    peer_type = "outgoing"
+                    if peer_logical < num_ghosts:
+                        # we have a ghost, check if the peer who connects
+                        # to our ghost is actually outgoing
+                        ghost_partner_logical = (peer_logical - arc) % n
+                        if ghost_partner_logical & arc == 0:
+                            peer_type = peer_type + ", ghost incoming"
+                    new_info[peer_physical] = new_info[peer_physical] | info[peer_physical] | info[partner_physical]
+                    new_info[partner_physical] = new_info[partner_physical] | info[peer_physical] | info[partner_physical]
+                else:
+                    peer_type = "incoming"
+                if verbose > 1:
+                    print("type of", str(peer_physical) + ":", peer_type)
+            info = new_info
+            arc = arc << 1
+        rounds = rounds + 1
+        random.shuffle(peers)
+    return rounds
 
 
 if __name__ == "__main__":
-  parser = argparse.ArgumentParser()
-  parser.add_argument("k", metavar="k", type=int, help="#(bad peers)")
-  parser.add_argument("n", metavar="n", type=int, help="#(all peers)")
-  parser.add_argument("r", metavar="r", type=int, help="#(rounds)")
-  parser.add_argument('--verbose', '-v', action='count')
+    parser = argparse.ArgumentParser()
+    parser.add_argument("k", metavar="k", type=int, help="#(bad peers)")
+    parser.add_argument("n", metavar="n", type=int, help="#(all peers)")
+    parser.add_argument("r", metavar="r", type=int, help="#(rounds)")
+    parser.add_argument('--verbose', '-v', action='count')
 
-  args = parser.parse_args()
-  sum = 0.0
-  for n in xrange(0, args.r):
-    sum += simulate(args.k, args.n, args.verbose)
-  print(sum / args.r)
+    args = parser.parse_args()
+    sum = 0.0
+    for n in xrange(0, args.r):
+        sum += simulate(args.k, args.n, args.verbose)
+    print(sum / args.r)
-- 
2.25.1