Merge pull request #129 from harmony-one/HAR-99_support_beacon_test_in_local

HAR-99: support beacon test in local

.gitignore

@@ -31,3 +31,6 @@ keystore
 
 # Cscope files
 cscope.*
+
+# local runtime logs
+tmp_log

deploy.sh

@@ -61,6 +61,7 @@ fi
 # Also it's recommended to use `go build` for testing the whole exe. 
 go build -o bin/benchmark
 go build -o bin/txgen client/txgen/main.go
+go build -o bin/beacon runbeacon/run-beacon.go
 
 # Create a tmp folder for logs
 t=`date +"%Y%m%d-%H%M%S"`
@@ -68,6 +69,11 @@ log_folder="tmp_log/log-$t"
 
 mkdir -p $log_folder
 
+if [ -n "$PEER" ]; then
+   ./bin/beacon > $log_folder/beacon.log 2>&1 &
+   sleep 1 #wait or beachchain up
+fi
+
 # Start nodes
 while IFS='' read -r line || [[ -n "$line" ]]; do
   IFS=' ' read ip port mode shardID <<< $line
@@ -77,7 +83,7 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
       ./bin/benchmark -ip $ip -port $port -config_file $config -log_folder $log_folder $DB -min_peers $MIN &
     else
       ./bin/benchmark -ip $ip -port $port -log_folder $log_folder $DB $PEER -min_peers $MIN &
-      sleep 5
+      sleep 1
     fi
   fi
 done < $config
@@ -85,3 +91,6 @@ done < $config
 if [ "$TXGEN" == "true" ]; then
   ./bin/txgen -config_file $config -log_folder $log_folder -duration $DURATION
 fi
+
+# Kill nodes if any
+./kill_node.sh

go_executable_build.sh

@@ -2,6 +2,7 @@
 declare -A SRC
 SRC[benchmark]=benchmark.go
 SRC[txgen]=client/txgen/main.go
+SRC[beacon]=runbeacon/run-beacon.go
 
 BINDIR=bin
 BUCKET=unique-bucket-bin

kill_node.sh

@@ -1,4 +1,6 @@
-for pid in `/bin/ps -fu $USER| grep "benchmark\|txgen\|soldier\|commander\|profiler" | grep -v "grep" | awk '{print $2}'`;
+#!/bin/bash
+
+for pid in `/bin/ps -fu $USER| grep "benchmark\|txgen\|soldier\|commander\|profiler\|beacon" | grep -v "grep" | grep -v "vi" | awk '{print $2}'`;
 do
     echo 'Killed process: '$pid
     kill -9 $pid

local_config1.txt

@@ -0,0 +1,12 @@
+127.0.0.1 9000 leader 0
+127.0.0.1 9001 validator 0
+127.0.0.1 9002 validator 0
+127.0.0.1 9003 validator 0
+127.0.0.1 9004 validator 0
+127.0.0.1 9005 validator 0
+127.0.0.1 9006 validator 0
+127.0.0.1 9007 validator 0
+127.0.0.1 9008 validator 0
+127.0.0.1 9009 validator 0
+127.0.0.1 9010 validator 0
+127.0.0.1 9999 client 0

runbeacon/run-beacon.go

@@ -2,15 +2,37 @@ package main
 
 import (
 	"flag"
+	"fmt"
+	"os"
+	"path"
 
 	"github.com/harmony-one/harmony/beaconchain"
 )
 
+var (
+	version string
+	builtBy string
+	builtAt string
+	commit  string
+)
+
+func printVersion(me string) {
+	fmt.Fprintf(os.Stderr, "Harmony (C) 2018. %v, version %v-%v (%v %v)\n", path.Base(me), version, commit, builtBy, builtAt)
+	os.Exit(0)
+}
+
 func main() {
 	numShards := flag.Int("numShards", 1, "number of shards of identity chain")
 	ip := flag.String("ip", "127.0.0.1", "ip on which beaconchain listens")
 	port := flag.String("port", "8081", "port on which beaconchain listens")
+	versionFlag := flag.Bool("version", false, "Output version info")
+
 	flag.Parse()
+
+	if *versionFlag {
+		printVersion(os.Args[0])
+	}
+
 	bc := beaconchain.New(*numShards, *ip, *port)
 	bc.StartServer()
 }