test: env party/port and NetIO::listen()/connect() factories

party from parse_party(argv); port/IP from peer_port()/peer_ip(). The stack
`NetIO io(party==ALICE?nullptr:peer_ip(), port)` becomes `auto io = listen/
connect(...)` (unique_ptr); SH2PCSession takes io.get(), and the two helpers
that borrow the channel by reference receive *io.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>

Author: wangxiao1254

README.md

@@ -27,7 +27,8 @@ protocol state, and `sess.direct_ctx()` is the gate context your values are buil
 #include <emp-sh2pc/emp-sh2pc.h>
 using namespace emp;
 
-NetIO io(party == ALICE ? nullptr : "127.0.0.1", port);
+int party = parse_party(argv);   // argv[1]; port/IP come from $EMP_PORT / $EMP_PEER_IP
+NetIO io(party == ALICE ? nullptr : peer_ip(), peer_port());
 SH2PCSession sess(&io, party);
 
 using Ctx = SH2PCSession::DirectCtx;        // the gate context values are built over

run

@@ -1,33 +1,34 @@
 #!/bin/bash
 # Two-party local test harness. Pick a fresh random port per invocation so back-
-# to-back ctest runs don't collide on a socket still in TIME_WAIT.
-PORT=$(( (RANDOM % 30000) + 20000 ))
+# to-back ctest runs don't collide on a socket still in TIME_WAIT. Port travels
+# via EMP_PORT (read by peer_port()); only the party id is a positional arg.
+export EMP_PORT=$(( (RANDOM % 30000) + 20000 ))
 if [ "$1" == "-p1" ]
 then
    shift
-   perf record  $1 1 $PORT & (sleep 0.1;  $1 2 $PORT)
+   perf record  $1 1 & (sleep 0.1;  $1 2)
 elif [ "$1" == "-p2" ]
 then
    shift
-   (sleep 0.1; $1 1 $PORT) & (perf record $1 2 $PORT)
+   (sleep 0.1; $1 1) & (perf record $1 2)
 
 elif [ "$1" == "-m1" ]
 then
    shift
-   valgrind --leak-check=full $1 1 $PORT & $1 2 $PORT
+   valgrind --leak-check=full $1 1 & $1 2
 elif [ "$1" == "-m2" ]
 then
    shift
-   $1 1 $PORT & valgrind --leak-check=full $1 2 $PORT
+   $1 1 & valgrind --leak-check=full $1 2
 elif [ "$1" == "-t1" ]
 then
    shift
-   time $1 1 $PORT & $1 2 $PORT
+   time $1 1 & $1 2
 elif [ "$1" == "-t2" ]
 then
    shift
-   $1 1 $PORT & time $1 2 $PORT
+   $1 1 & time $1 2
 
 else
-  (sleep 0.05; $1 1 $PORT) &  $1 2 $PORT
+  (sleep 0.05; $1 1) &  $1 2
 fi

test/test_aes.cpp

@@ -14,10 +14,11 @@ using namespace std;
 
 int main(int argc, char** argv) {
 	int port, party;
-	parse_party_and_port(argv, &party, &port);
-	NetIO io(party == ALICE ? nullptr : "127.0.0.1", port);
+	party = parse_party(argv);
+	port = peer_port();
+	auto io = (party == ALICE) ? NetIO::listen(port) : NetIO::connect(peer_ip(), port);
 
-	SH2PCSession sess(&io, party);
+	SH2PCSession sess(io.get(), party);
 
 	using Wire = SH2PCCtx::Wire;   // = block: the wire is the live garbled label
 	bool zero[128];

test/test_bit.cpp

@@ -73,11 +73,12 @@ static int test_bit(SH2PCSession& sess, NetIO& io, int party) {
 
 int main(int argc, char** argv) {
 	int port, party;
-	parse_party_and_port(argv, &party, &port);
-	NetIO io(party == ALICE ? nullptr : "127.0.0.1", port);
-	SH2PCSession sess(&io, party);
+	party = parse_party(argv);
+	port = peer_port();
+	auto io = (party == ALICE) ? NetIO::listen(port) : NetIO::connect(peer_ip(), port);
+	SH2PCSession sess(io.get(), party);
 
-	int fails = test_bit(sess, io, party);
+	int fails = test_bit(sess, *io, party);
 
 	sess.finalize();
 	if (party == BOB) cout << "test_bit: " << (fails ? "FAILED" : "PASS") << endl;

test/test_circuit_fn_sh2pc.cpp

@@ -3,7 +3,7 @@
 // live SH2PCSession context — compile-once / run-on-any-context. Both parties compile the
 // same (deterministic) circuit and replay it in lockstep. C++20.
 
-#include "emp-sh2pc/emp-sh2pc.h"           // NetIO, parse_party_and_port, SH2PCSession
+#include "emp-sh2pc/emp-sh2pc.h"           // NetIO, parse_party, SH2PCSession
 #include "emp-tool/circuits/frontend/circuit_fn.h"  // frontend::compile / run
 #include "emp-tool/circuits/frontend/rec.h"         // rec::UInt / rec::Float shapes
 #include <cstdint>
@@ -17,10 +17,11 @@ using F32 = Float_T<SH2PCSession::ctx_t, 32>;
 
 int main(int argc, char** argv) {
     int port, party;
-    parse_party_and_port(argv, &party, &port);
-    NetIO io(party == ALICE ? nullptr : "127.0.0.1", port);
+    party = parse_party(argv);
+    port = peer_port();
+    auto io = (party == ALICE) ? NetIO::listen(port) : NetIO::connect(peer_ip(), port);
 
-    SH2PCSession sess(&io, party);
+    SH2PCSession sess(io.get(), party);
     int fails = 0;
 
     // Compile once, host-side (no protocol, no I/O): pure circuit functions.

test/test_context_sh2pc.cpp

@@ -4,7 +4,7 @@
 // input<T>()/reveal<T>() own the OT. Demonstrates a templated integer kernel and
 // an IR-replay float builtin. C++20.
 
-#include "emp-sh2pc/emp-sh2pc.h"          // NetIO, parse_party_and_port, ALICE/BOB
+#include "emp-sh2pc/emp-sh2pc.h"          // NetIO, parse_party, ALICE/BOB
 #include "emp-sh2pc/sh2pc_session.h"      // SH2PCSession
 #include "emp-tool/circuits/typed.h"
 #include <cstdint>
@@ -14,10 +14,11 @@ using namespace emp;
 
 int main(int argc, char** argv) {
     int port, party;
-    parse_party_and_port(argv, &party, &port);
-    NetIO io(party == ALICE ? nullptr : "127.0.0.1", port);
+    party = parse_party(argv);
+    port = peer_port();
+    auto io = (party == ALICE) ? NetIO::listen(port) : NetIO::connect(peer_ip(), port);
 
-    SH2PCSession sess(&io, party);              // owns crypto/IO/OT/Delta — no global backend
+    SH2PCSession sess(io.get(), party);              // owns crypto/IO/OT/Delta — no global backend
     int fails = 0;
 
     // 1) keep-templated kernel: UInt32 add (ALICE owns a, BOB owns b).

test/test_example.cpp

@@ -18,12 +18,13 @@ void test_millionare(SH2PCSession& sess, int number) {
 
 int main(int argc, char** argv) {
 	int port, party;
-	parse_party_and_port(argv, &party, &port);
+	party = parse_party(argv);
+	port = peer_port();
 	int num = 20;
-	if (argc > 3) num = atoi(argv[3]);
-	NetIO io(party == ALICE ? nullptr : "127.0.0.1", port);
+	if (argc > 2) num = atoi(argv[2]);
+	auto io = (party == ALICE) ? NetIO::listen(port) : NetIO::connect(peer_ip(), port);
 
-	SH2PCSession sess(&io, party);
+	SH2PCSession sess(io.get(), party);
 	test_millionare(sess, num);
 	cout << sess.num_and() << endl;
 	sess.finalize();

test/test_float.cpp

@@ -148,23 +148,24 @@ int fp_checks(SH2PCSession& sess) {
 
 int main(int argc, char** argv) {
 	int port, party;
-	parse_party_and_port(argv, &party, &port);
-	NetIO io(party == ALICE ? nullptr : "127.0.0.1", port);
+	party = parse_party(argv);
+	port = peer_port();
+	auto io = (party == ALICE) ? NetIO::listen(port) : NetIO::connect(peer_ip(), port);
 
 	// Agree on the PRG seed before the session opens so matched inputs are not
 	// folded into the garbled-circuit transcript.
 	block test_seed;
 	if (party == ALICE) {
 		PRG().random_block(&test_seed, 1);
-		io.send_data(&test_seed, sizeof(block));
+		io->send_data(&test_seed, sizeof(block));
 	} else {
-		io.recv_data(&test_seed, sizeof(block));
+		io->recv_data(&test_seed, sizeof(block));
 	}
-	io.flush();
+	io->flush();
 	PRG prg(&test_seed);
 
 	// Larger BOB-input COT batch keeps repeated float ops off the refill path.
-	SH2PCSession sess(&io, party, 1024 * 1024);
+	SH2PCSession sess(io.get(), party, 1024 * 1024);
 
 	int fails = 0;
 	fails += fp_checks(sess);

test/test_int.cpp

@@ -44,20 +44,21 @@ int test_int(SH2PCSession& sess, int runs = kRuns) {
 
 int main(int argc, char** argv) {
 	int port, party;
-	parse_party_and_port(argv, &party, &port);
-	NetIO io(party == ALICE ? nullptr : "127.0.0.1", port);
+	party = parse_party(argv);
+	port = peer_port();
+	auto io = (party == ALICE) ? NetIO::listen(port) : NetIO::connect(peer_ip(), port);
 
 	// Agree on the PRG seed for matched test inputs, before the session opens
 	// so it isn't folded into the garbled-circuit transcript.
 	if (party == ALICE) {
 		PRG().random_block(&test_seed, 1);
-		io.send_data(&test_seed, sizeof(block));
+		io->send_data(&test_seed, sizeof(block));
 	} else {
-		io.recv_data(&test_seed, sizeof(block));
+		io->recv_data(&test_seed, sizeof(block));
 	}
-	io.flush();
+	io->flush();
 
-	SH2PCSession sess(&io, party);
+	SH2PCSession sess(io.get(), party);
 
 	int fails = 0;
 	fails += test_int<std::plus<uint32_t>,       std::plus<U32>>(sess);

test/test_repeat.cpp

@@ -13,8 +13,8 @@ static int test_int_reveal(int party, int port, int number) {
 	// Brief pause so the previous iteration's listener has fully released the
 	// port before this one re-binds it (same-port sequential reconnects).
 	usleep(100);
-	NetIO netio(party == ALICE ? nullptr : "127.0.0.1", port, true);
-	SH2PCSession sess(&netio, party, 1024);
+	auto netio = (party == ALICE) ? NetIO::listen(port, true) : NetIO::connect(peer_ip(), port, true);
+	SH2PCSession sess(netio.get(), party, 1024);
 
 	SI a = sess.input<SI>(ALICE, (int64_t)number);
 	SI b;
@@ -32,7 +32,8 @@ static int test_int_reveal(int party, int port, int number) {
 
 int main(int argc, char** argv) {
 	int party, port;
-	parse_party_and_port(argv, &party, &port);
+	party = parse_party(argv);
+	port = peer_port();
 
 	int fails = 0;
 	for (int i = 0; i < 100; ++i)