Merge branch 'master' of github.com:Determinant/hot-stuff

1 files changed, 15 insertions, 5 deletions

diff --git a/scripts/gen_conf.py b/scripts/gen_conf.py
index bc45540..391e0d6 100644
--- a/scripts/gen_conf.py
+++ b/scripts/gen_conf.py
@@ -6,33 +6,43 @@ import argparse
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Generate configuration file for a batch of replicas')
     parser.add_argument('--prefix', type=str, default='hotstuff.gen')
-    parser.add_argument('--iplist', type=str, default=None)
+    parser.add_argument('--ips', type=str, default=None)
     parser.add_argument('--iter', type=int, default=10)
     parser.add_argument('--pport', type=int, default=10000)
     parser.add_argument('--cport', type=int, default=20000)
     parser.add_argument('--keygen', type=str, default='./hotstuff-keygen')
+    parser.add_argument('--nodes', type=str, default='nodes.txt')
+    parser.add_argument('--block-size', type=int, default=1)
+    parser.add_argument('--pace-maker', type=str, default='dummy')
     args = parser.parse_args()
 
 
-    if args.iplist is None:
+    if args.ips is None:
         ips = ['127.0.0.1']
     else:
-        ips = [l.strip() for l in open(args.iplist, 'r').readlines()]
+        ips = [l.strip() for l in open(args.ips, 'r').readlines()]
     prefix = args.prefix
     iter = args.iter
     base_pport = args.pport
     base_cport = args.cport
-    keygen_bin= args.keygen
+    keygen_bin = args.keygen
 
     main_conf = open("{}.conf".format(prefix), 'w')
+    nodes = open(args.nodes, 'w')
     replicas = ["{}:{};{}".format(ip, base_pport + i, base_cport + i)
                 for ip in ips
                 for i in range(iter)]
     p = subprocess.Popen([keygen_bin, '--num', str(len(replicas))],
                         stdout=subprocess.PIPE, stderr=open(os.devnull, 'w'))
     keys = [[t[4:] for t in l.decode('ascii').split()] for l in p.stdout]
+    if not (args.block_size is None):
+        main_conf.write("block-size = {}\n".format(args.block_size))
+    if not (args.pace_maker is None):
+        main_conf.write("pace-maker = {}\n".format(args.pace_maker))
     for r in zip(replicas, keys, itertools.count(0)):
         main_conf.write("replica = {}, {}\n".format(r[0], r[1][0]))
-        r_conf = open("{}-sec{}.conf".format(prefix, r[2]), 'w')
+        r_conf_name = "{}-sec{}.conf".format(prefix, r[2])
+        nodes.write("{}:{}\t{}\n".format(r[2], r[0], r_conf_name))
+        r_conf = open(r_conf_name, 'w')
         r_conf.write("privkey = {}\n".format(r[1][1]))
         r_conf.write("idx = {}\n".format(r[2]))