Minor updates

.travis.yml

@@ -12,8 +12,8 @@ services:
   - docker
 
 install:
-  - docker build -t ethresearch/sharding-p2p:latest .
-  - docker run -d --name p2p ethresearch/sharding-p2p:latest
+  - docker build -t ethresearch/sharding-p2p-poc:latest .
+  - docker run -d --name p2p ethresearch/sharding-p2p-poc:latest
 
 before_install:
   - go mod download

cli-example/common.sh

@@ -31,6 +31,16 @@ spinup_node() {
     $EXE_NAME -seed=$seed -port=$port -rpcport=$rpcport -verbose $params &
 }
 
+# spinup_node_with_bootstrapping {seed} {list_bootnode_multiaddr}
+spinup_node_with_bootstrapping() {
+    seed=$1
+    port=$(show_port $seed)
+    rpcport=$(show_rpcport $seed)
+    p=$@
+    list_bootnode_multiaddr=${@:2}
+    $EXE_NAME -seed=$seed -port=$port -rpcport=$rpcport -verbose -bootstrap -bootnodes=$list_bootnode_multiaddr &
+}
+
 cli_prompt() {
     p=$@
     seed=$1
@@ -49,7 +59,8 @@ identify() {
 show_pid() {
     seed=$1
     identify=$(identify $seed)
-    re="^([A-Za-z0-9]+) "
+    re='"peerID":"([A-Za-z0-9]+)"'
+    # re='^{"peer(ID)"'
     if [[ $identify =~ $re ]]; then
         pid=${BASH_REMATCH[1]};
     fi

deployment/ansible/roles/common/tasks/build_image.yml

@@ -10,7 +10,7 @@
   become: true
   docker_image:
     path: "/home/ubuntu/sharding-p2p-poc"
-    name: ethereum/sharding-p2p:dev
+    name: ethereum/sharding-p2p-poc:testing
     dockerfile: docker/dev.Dockerfile
     nocache: true
     force: true

deployment/ansible/roles/common/tasks/run_docker.yml

@@ -3,7 +3,7 @@
   become: true
   docker_container:
     name: peer_{{ item }}
-    image: ethresearch/sharding-p2p:dev
+    image: ethresearch/sharding-p2p-poc:testing
     pull: yes
     state: started
     restart_policy: always

main.go

@@ -27,7 +27,7 @@ import (
 )
 
 var (
-	logger    = logging.Logger("sharding-p2p")
+	logger    = logging.Logger("sharding-p2p-poc")
 	GitCommit string
 )
 
@@ -80,9 +80,9 @@ func main() {
 	rpcAddr := fmt.Sprintf("%v:%v", *rpcIP, *rpcPort)
 	notifierAddr := fmt.Sprintf("%v:%v", *rpcIP, *notifierPort)
 	if *verbose {
-		logging.SetLogLevel("sharding-p2p", "DEBUG")
+		logging.SetLogLevel("sharding-p2p-poc", "DEBUG")
 	} else {
-		logging.SetLogLevel("sharding-p2p", "ERROR")
+		logging.SetLogLevel("sharding-p2p-poc", "ERROR")
 	}
 
 	cliArgs := flag.Args()
@@ -191,7 +191,7 @@ func runServer(
 			Param: 1,
 		},
 		Reporter: &jaegerconfig.ReporterConfig{
-			LogSpans:           true,
+			LogSpans:           false,
 			LocalAgentHostPort: localAgentHostPort,
 		},
 	}
@@ -273,7 +273,10 @@ func makeNode(
 	// Make a host that listens on the given multiaddress
 	node := NewNode(ctx, routedHost, dht, eventNotifier)
 	if doBootstrapping {
-		node.StartBootstrapping(ctx, bootstrapPeers)
+		err := node.StartBootstrapping(ctx, bootstrapPeers)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	return node, nil

scripts/docker-build.sh

@@ -1 +1 @@
-docker build --build-arg GIT_COMMIT=$(git rev-list -1 HEAD) -t ethresearch/sharding-p2p:dev .
+docker build --build-arg GIT_COMMIT=$(git rev-list -1 HEAD) -t ethresearch/sharding-p2p-poc:testing .

test/simulation/simulation/node.py

@@ -66,7 +66,7 @@ def run(self, bootnodes=None):
             bootnodes_cmd = "-bootstrap -bootnodes={}".format(
                 ",".join(bootnodes),
             )
-        cmd = "docker run -d --name {} -p {}:10000 -p {}:13000 ethresearch/sharding-p2p:dev sh -c \"./sharding-p2p-poc -verbose -ip=0.0.0.0 -seed={} {}\"".format(  # noqa: E501
+        cmd = "docker run -d --name {} -p {}:10000 -p {}:13000 ethresearch/sharding-p2p-poc:testing sh -c \"./sharding-p2p-poc -verbose -ip=0.0.0.0 -seed={} {}\"".format(  # noqa: E501
             self.name,
             self.port,
             self.rpc_port,