From c778d7f5d1f9b5cdd24efe0d555e21eca5cc1389 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Sat, 7 Apr 2018 23:13:41 +0300
Subject: [PATCH] fix addresses

---
 scripts/wire2amino.go                               | 2 +-
 test/p2p/data/mach1/core/config/priv_validator.json | 2 +-
 test/p2p/data/mach2/core/config/priv_validator.json | 2 +-
 test/p2p/data/mach3/core/config/priv_validator.json | 2 +-
 test/p2p/data/mach4/core/config/priv_validator.json | 2 +-
 test/p2p/peer.sh                                    | 5 +----
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/scripts/wire2amino.go b/scripts/wire2amino.go
index dd81ad2d8..949082877 100644
--- a/scripts/wire2amino.go
+++ b/scripts/wire2amino.go
@@ -85,7 +85,7 @@ func convertPrivVal(cdc *amino.Codec, jsonBytes []byte) ([]byte, error) {
 	copy(pubKey[:], privVal.PubKey.Data)
 
 	privValNew := priv_val.FilePV{
-		Address:    privVal.Address,
+		Address:    pubKey.Address(),
 		PubKey:     pubKey,
 		LastHeight: privVal.LastHeight,
 		LastRound:  privVal.LastRound,
diff --git a/test/p2p/data/mach1/core/config/priv_validator.json b/test/p2p/data/mach1/core/config/priv_validator.json
index 4a7d3ade9..08c7c503b 100644
--- a/test/p2p/data/mach1/core/config/priv_validator.json
+++ b/test/p2p/data/mach1/core/config/priv_validator.json
@@ -1,5 +1,5 @@
 {
-  "address": "0E6925C3EE4C599DFF1536A5071AF4A26DF33635",
+  "address": "7E9D1FB08EDBAFCF116638D4C8FAFAEE2ABE1AAA",
   "pub_key": {
     "type": "AC26791624DE60",
     "value": "vokz3/FgDAJuNHGPF4Wkzeq5DDVpizlOOLaUeukd4RY="
diff --git a/test/p2p/data/mach2/core/config/priv_validator.json b/test/p2p/data/mach2/core/config/priv_validator.json
index b44541742..8e813dff4 100644
--- a/test/p2p/data/mach2/core/config/priv_validator.json
+++ b/test/p2p/data/mach2/core/config/priv_validator.json
@@ -1,5 +1,5 @@
 {
-  "address": "99DBBD2AFC28FB5BAC5574AFAF0D9C806CED3B55",
+  "address": "8893D14FE09F1157E39CD34B98036048D51B4985",
   "pub_key": {
     "type": "AC26791624DE60",
     "value": "bcU0RlMjEmWH0qKpO1nWibcXBzsd6WiiWm7xPVlTGK0="
diff --git a/test/p2p/data/mach3/core/config/priv_validator.json b/test/p2p/data/mach3/core/config/priv_validator.json
index 8ca68d563..84c98b98f 100644
--- a/test/p2p/data/mach3/core/config/priv_validator.json
+++ b/test/p2p/data/mach3/core/config/priv_validator.json
@@ -1,5 +1,5 @@
 {
-  "address": "4C5F061DAC28660853904A66705B12CA2B317572",
+  "address": "7C747D7E002932B3864E3FBE9AC04287043F66A0",
   "pub_key": {
     "type": "AC26791624DE60",
     "value": "rmesaX0TWqC0YB6lfqqz/r9Lqk8inEWlmMKYWxL80aE="
diff --git a/test/p2p/data/mach4/core/config/priv_validator.json b/test/p2p/data/mach4/core/config/priv_validator.json
index 7ef32a6f3..4f88045b5 100644
--- a/test/p2p/data/mach4/core/config/priv_validator.json
+++ b/test/p2p/data/mach4/core/config/priv_validator.json
@@ -1,5 +1,5 @@
 {
-  "address": "86F6DA4B34F16D743D2D992B5ACB12F5E724CC2D",
+  "address": "CEBEFE3CA1363D425643EF63FC179E77A50A1E9A",
   "pub_key": {
     "type": "AC26791624DE60",
     "value": "nryPWM7UtG3NWrirpZHdJTzXy1A3Jz/aMrwLZGHE79k="
diff --git a/test/p2p/peer.sh b/test/p2p/peer.sh
index d5ede231a..15d44ff33 100644
--- a/test/p2p/peer.sh
+++ b/test/p2p/peer.sh
@@ -10,13 +10,10 @@ set +u
 NODE_FLAGS=$5
 set -u
 
-set +eu
-
 echo "starting tendermint peer ID=$ID"
 # start tendermint container on the network
 # NOTE: $NODE_FLAGS should be unescaped (no quotes). otherwise it will be
 # treated as one flag.
-set -u
 docker run -d \
 	--net="$NETWORK_NAME" \
 	--ip=$(test/p2p/ip.sh "$ID") \
@@ -27,4 +24,4 @@ docker run -d \
 	--log-opt syslog-address=udp://127.0.0.1:5514 \
 	--log-opt syslog-facility=daemon \
 	--log-opt tag="{{.Name}}" \
-		"$DOCKER_IMAGE" node $NODE_FLAGS --log_level=debug --proxy_app="$APP_PROXY"
+	"$DOCKER_IMAGE" node $NODE_FLAGS --log_level=debug --proxy_app="$APP_PROXY"