From db1537f526b724fffcad4e31d60b628ff1c101ab Mon Sep 17 00:00:00 2001
From: Dave Collins <davec@conformal.com>
Date: Thu, 28 Sep 2023 15:42:56 -0500
Subject: [PATCH] pool: Use mock client names in tests.

This modifies various pool tests to used mock client names instead of
referencing specific models of ASICs which no longer exist.
---
 pool/acceptedwork_test.go | 15 ++++++++++-----
 pool/chainstate_test.go   | 10 +++++++---
 pool/client.go            |  6 +++---
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pool/acceptedwork_test.go b/pool/acceptedwork_test.go
index 29b85075..c2cdf39f 100644
--- a/pool/acceptedwork_test.go
+++ b/pool/acceptedwork_test.go
@@ -13,10 +13,15 @@ import (
 
 func testAcceptedWork(t *testing.T) {
 	// Created some valid accepted work.
+	const (
+		xClient  = "cpux"
+		x2Client = "cpux2"
+		yClient  = "cpuy"
+	)
 	workA := NewAcceptedWork(
 		"00000000000000001e2065a7248a9b4d3886fe3ca3128eebedddaf35fb26e58c",
 		"000000000000000007301a21efa98033e06f7eba836990394fff9f765f1556b1",
-		396692, yID, "dr3")
+		396692, yID, yClient)
 	err := db.persistAcceptedWork(workA)
 	if err != nil {
 		t.Fatal(err)
@@ -25,7 +30,7 @@ func testAcceptedWork(t *testing.T) {
 	workB := NewAcceptedWork(
 		"000000000000000025aa4a7ba8c3ece4608376bf84a82ec7e025991460097198",
 		"00000000000000001e2065a7248a9b4d3886fe3ca3128eebedddaf35fb26e58c",
-		396693, xID, "dr5")
+		396693, xID, xClient)
 	err = db.persistAcceptedWork(workB)
 	if err != nil {
 		t.Fatal(err)
@@ -34,7 +39,7 @@ func testAcceptedWork(t *testing.T) {
 	workC := NewAcceptedWork(
 		"0000000000000000053236ce6c274aa49a1cc6e9d906e855725c79f69c1089d3",
 		"000000000000000025aa4a7ba8c3ece4608376bf84a82ec7e025991460097198",
-		396694, xID, "dr5")
+		396694, xID, xClient)
 	err = db.persistAcceptedWork(workC)
 	if err != nil {
 		t.Fatal(err)
@@ -43,7 +48,7 @@ func testAcceptedWork(t *testing.T) {
 	workD := NewAcceptedWork(
 		"000000000000000020f9ab2b1e144a818d36a857aefda55363f5e86e01855c79",
 		"0000000000000000053236ce6c274aa49a1cc6e9d906e855725c79f69c1089d3",
-		396695, xID, "dr5")
+		396695, xID, xClient)
 	err = db.persistAcceptedWork(workD)
 	if err != nil {
 		t.Fatal(err)
@@ -52,7 +57,7 @@ func testAcceptedWork(t *testing.T) {
 	workE := NewAcceptedWork(
 		"0000000000000000032e25218be722327ae3dccf9015756facb2f98931fda7b8",
 		"00000000000000000476712b2f5df31bc62b9976066262af2d639a551853c056",
-		431611, xID, "dcr1")
+		431611, xID, x2Client)
 
 	// Ensure updating a non persisted accepted work returns an error.
 	err = db.updateAcceptedWork(workE)
diff --git a/pool/chainstate_test.go b/pool/chainstate_test.go
index f19dc741..2bd3809c 100644
--- a/pool/chainstate_test.go
+++ b/pool/chainstate_test.go
@@ -86,10 +86,14 @@ func testChainState(t *testing.T) {
 	cs := NewChainState(cCfg)
 
 	// Test pruneAcceptedWork.
+	const (
+		xClient = "cpux"
+		yClient = "cpuy"
+	)
 	workA := NewAcceptedWork(
 		"00000000000000001e2065a7248a9b4d3886fe3ca3128eebedddaf35fb26e58c",
 		"000000000000000007301a21efa98033e06f7eba836990394fff9f765f1556b1",
-		396692, yID, "dr3")
+		396692, yID, yClient)
 	workA.Confirmed = true
 	err = db.persistAcceptedWork(workA)
 	if err != nil {
@@ -99,7 +103,7 @@ func testChainState(t *testing.T) {
 	workB := NewAcceptedWork(
 		"000000000000000025aa4a7ba8c3ece4608376bf84a82ec7e025991460097198",
 		"00000000000000001e2065a7248a9b4d3886fe3ca3128eebedddaf35fb26e58c",
-		396693, xID, "dr5")
+		396693, xID, xClient)
 	err = db.persistAcceptedWork(workB)
 	if err != nil {
 		t.Fatal(err)
@@ -108,7 +112,7 @@ func testChainState(t *testing.T) {
 	workC := NewAcceptedWork(
 		zeroHash.String(),
 		"00000000000000001e2065a7248a9b4d3886fe3ca3128eebedddaf35fb26e58c",
-		396694, xID, "dr5")
+		396694, xID, xClient)
 	err = db.persistAcceptedWork(workC)
 	if err != nil {
 		t.Fatal(err)
diff --git a/pool/client.go b/pool/client.go
index bcb64893..d007746c 100644
--- a/pool/client.go
+++ b/pool/client.go
@@ -420,9 +420,9 @@ func (c *Client) handleSubscribeRequest(req *Request, allowed bool) error {
 		resp = SubscribeResponse(*req.ID, nid, c.extraNonce1,
 			ExtraNonce2Size, nil)
 
-	case AntminerDR3, AntminerDR5:
-		// The DR5 and DR3 are not fully complaint with the stratum spec.
-		// They use an 8-byte extraNonce2 regardless of the
+	case AntminerDR3:
+		// The DR3 is not fully complaint with the stratum spec.
+		// It uses an 8-byte extraNonce2 regardless of the
 		// extraNonce2Size provided.
 		//
 		// The extraNonce1 is appended to the extraNonce2 in the