Add IPv6 support for P2P integration tests (#4340)

test/p2p/basic/test.sh

@@ -1,7 +1,8 @@
 #! /bin/bash
 set -u
 
-N=$1
+IPV=$1
+N=$2
 
 ###################################################################
 # wait for all peers to come online
@@ -16,7 +17,7 @@ MAX_SLEEP=60
 # wait for everyone to come online
 echo "Waiting for nodes to come online"
 for i in `seq 1 $N`; do
-	addr=$(test/p2p/ip.sh $i):26657
+	addr=$(test/p2p/address.sh $IPV $i 26657)
 	curl -s $addr/status > /dev/null
 	ERR=$?
 	COUNT=0
@@ -36,7 +37,7 @@ done
 echo ""
 # wait for each of them to sync up
 for i in `seq 1 $N`; do
-	addr=$(test/p2p/ip.sh $i):26657
+	addr=$(test/p2p/address.sh $IPV $i 26657)
 	N_1=$(($N - 1))
 
 	# - assert everyone has N-1 other peers