all: move testutil to internal/testutil (#735)

joshuasing · web-flow · commit 29d06849bf79 · 2025-10-30T03:28:40.000+11:00
* all: move testutil to internal/testutil

* changelog: add entry
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update required Go version to [Go 1.25](https://tip.golang.org/doc/go1.25)
   ([#673](https://github.com/hemilabs/heminetwork/pull/673), [#698](https://github.com/hemilabs/heminetwork/pull/698)).
 
+- Move `testutil` into the `internal/` package, removing it from the public API
+  ([#735](https://github.com/hemilabs/heminetwork/pull/735)).
+
 ### Fixed
 
 - Fix typos across the codebase
diff --git a/bitcoin/wallet/gozer/tbcgozer/tbcgozer_test.go b/bitcoin/wallet/gozer/tbcgozer/tbcgozer_test.go
@@ -18,9 +18,9 @@ import (
 	"github.com/juju/loggo"
 
 	"github.com/hemilabs/heminetwork/v2/bitcoin/wallet/gozer"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil/mock"
 	"github.com/hemilabs/heminetwork/v2/service/tbc"
-	"github.com/hemilabs/heminetwork/v2/testutil"
-	"github.com/hemilabs/heminetwork/v2/testutil/mock"
 )
 
 func TestTBCGozerConnection(t *testing.T) {
diff --git a/bitcoin/wallet/wallet_test.go b/bitcoin/wallet/wallet_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/hemilabs/heminetwork/v2/bitcoin/wallet/zuul"
 	"github.com/hemilabs/heminetwork/v2/bitcoin/wallet/zuul/memory"
 	"github.com/hemilabs/heminetwork/v2/hemi"
-	"github.com/hemilabs/heminetwork/v2/testutil/mock"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil/mock"
 )
 
 func digest256(x []byte) []byte {
diff --git a/database/tbcd/level/encodedecode_test.go b/database/tbcd/level/encodedecode_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/hemilabs/heminetwork/v2/database/tbcd"
 	"github.com/hemilabs/heminetwork/v2/hemi"
-	"github.com/hemilabs/heminetwork/v2/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
 )
 
 func TestKeystoneEncodeDecode(t *testing.T) {
diff --git a/database/tbcd/level/level_test.go b/database/tbcd/level/level_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/hemilabs/heminetwork/v2/database/level"
 	"github.com/hemilabs/heminetwork/v2/database/tbcd"
 	"github.com/hemilabs/heminetwork/v2/hemi"
-	"github.com/hemilabs/heminetwork/v2/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
 )
 
 func TestMD(t *testing.T) {
diff --git a/e2e/e2e_ext_test.go b/e2e/e2e_ext_test.go
@@ -31,10 +31,10 @@ import (
 	"github.com/hemilabs/heminetwork/v2/database/tbcd"
 	"github.com/hemilabs/heminetwork/v2/database/tbcd/level"
 	"github.com/hemilabs/heminetwork/v2/hemi"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil/mock"
 	"github.com/hemilabs/heminetwork/v2/service/bfg"
 	"github.com/hemilabs/heminetwork/v2/service/tbc"
-	"github.com/hemilabs/heminetwork/v2/testutil"
-	"github.com/hemilabs/heminetwork/v2/testutil/mock"
 )
 
 func nextPort(ctx context.Context, t *testing.T) int {
diff --git a/internal/testutil/extract.go b/internal/testutil/extract.go
diff --git a/internal/testutil/mock/geth.go b/internal/testutil/mock/geth.go
diff --git a/internal/testutil/mock/mock.go b/internal/testutil/mock/mock.go
diff --git a/internal/testutil/mock/tbc.go b/internal/testutil/mock/tbc.go
@@ -29,8 +29,8 @@ import (
 	"github.com/hemilabs/heminetwork/v2/database/tbcd"
 	"github.com/hemilabs/heminetwork/v2/hemi"
 	"github.com/hemilabs/heminetwork/v2/hemi/pop"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
 	"github.com/hemilabs/heminetwork/v2/service/tbc"
-	"github.com/hemilabs/heminetwork/v2/testutil"
 )
 
 type TBCMockHandler struct {
diff --git a/internal/testutil/testutil.go b/internal/testutil/testutil.go
diff --git a/internal/testutil/testutil_test.go b/internal/testutil/testutil_test.go
diff --git a/service/bfg/bfg_test.go b/service/bfg/bfg_test.go
@@ -23,9 +23,9 @@ import (
 	"github.com/hemilabs/heminetwork/v2/api/bfgapi"
 	"github.com/hemilabs/heminetwork/v2/api/tbcapi"
 	"github.com/hemilabs/heminetwork/v2/hemi"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil/mock"
 	"github.com/hemilabs/heminetwork/v2/service/popm"
-	"github.com/hemilabs/heminetwork/v2/testutil"
-	"github.com/hemilabs/heminetwork/v2/testutil/mock"
 )
 
 const wantedKeystones = 10
diff --git a/service/hproxy/hproxy_test.go b/service/hproxy/hproxy_test.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 
-	"github.com/hemilabs/heminetwork/v2/testutil"
-	"github.com/hemilabs/heminetwork/v2/testutil/mock"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil/mock"
 )
 
 type serverReply struct {
diff --git a/service/popm/popm_test.go b/service/popm/popm_test.go
@@ -17,8 +17,8 @@ import (
 
 	"github.com/hemilabs/heminetwork/v2/api/tbcapi"
 	"github.com/hemilabs/heminetwork/v2/hemi"
-	"github.com/hemilabs/heminetwork/v2/testutil"
-	"github.com/hemilabs/heminetwork/v2/testutil/mock"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil/mock"
 )
 
 const wantedKeystones = 20
diff --git a/service/tbc/geometry_test.go b/service/tbc/geometry_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/hemilabs/heminetwork/v2/database/tbcd"
 	"github.com/hemilabs/heminetwork/v2/database/tbcd/level"
 	"github.com/hemilabs/heminetwork/v2/hemi"
-	"github.com/hemilabs/heminetwork/v2/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
 )
 
 func makeCheckpoints(start, count int) []chaincfg.Checkpoint {
diff --git a/service/tbc/mempool_test.go b/service/tbc/mempool_test.go
@@ -19,7 +19,7 @@ import (
 	"github.com/go-test/deep"
 
 	"github.com/hemilabs/heminetwork/v2/database/tbcd"
-	"github.com/hemilabs/heminetwork/v2/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
 )
 
 func TestMempoolFees(t *testing.T) {
diff --git a/service/tbc/rpc_test.go b/service/tbc/rpc_test.go
@@ -38,7 +38,7 @@ import (
 	"github.com/hemilabs/heminetwork/v2/database/tbcd"
 	"github.com/hemilabs/heminetwork/v2/hemi"
 	"github.com/hemilabs/heminetwork/v2/hemi/pop"
-	"github.com/hemilabs/heminetwork/v2/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
 )
 
 func bytes2Tx(b []byte) (*wire.MsgTx, error) {
diff --git a/service/tbc/tbc_test.go b/service/tbc/tbc_test.go
@@ -42,7 +42,7 @@ import (
 	"github.com/hemilabs/heminetwork/v2/database/tbcd"
 	"github.com/hemilabs/heminetwork/v2/database/tbcd/level"
 	"github.com/hemilabs/heminetwork/v2/hemi/pop"
-	"github.com/hemilabs/heminetwork/v2/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
 )
 
 const (
diff --git a/service/tbc/tbcfork_test.go b/service/tbc/tbcfork_test.go
@@ -36,8 +36,8 @@ import (
 	"github.com/hemilabs/heminetwork/v2/database/tbcd"
 	"github.com/hemilabs/heminetwork/v2/hemi"
 	"github.com/hemilabs/heminetwork/v2/hemi/pop"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
 	"github.com/hemilabs/heminetwork/v2/service/tbc/peer/rawpeer"
-	"github.com/hemilabs/heminetwork/v2/testutil"
 )
 
 type block struct {
diff --git a/service/tbc/zkindexer_test.go b/service/tbc/zkindexer_test.go
@@ -18,7 +18,7 @@ import (
 
 	"github.com/hemilabs/heminetwork/v2/database/tbcd"
 	"github.com/hemilabs/heminetwork/v2/database/tbcd/level"
-	"github.com/hemilabs/heminetwork/v2/testutil"
+	"github.com/hemilabs/heminetwork/v2/internal/testutil"
 )
 
 func TestZKEncodeRetrieve(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"github.com/hemilabs/heminetwork/v2/bitcoin/wallet/zuul"`
`22`	`22`	`"github.com/hemilabs/heminetwork/v2/bitcoin/wallet/zuul/memory"`
`23`	`23`	`"github.com/hemilabs/heminetwork/v2/hemi"`
`24`		`- "github.com/hemilabs/heminetwork/v2/testutil/mock"`
	`24`	`+ "github.com/hemilabs/heminetwork/v2/internal/testutil/mock"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func digest256(x []byte) []byte {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`"github.com/hemilabs/heminetwork/v2/database/tbcd"`
`14`	`14`	`"github.com/hemilabs/heminetwork/v2/hemi"`
`15`		`- "github.com/hemilabs/heminetwork/v2/testutil"`
	`15`	`+ "github.com/hemilabs/heminetwork/v2/internal/testutil"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func TestKeystoneEncodeDecode(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"github.com/hemilabs/heminetwork/v2/database/level"`
`23`	`23`	`"github.com/hemilabs/heminetwork/v2/database/tbcd"`
`24`	`24`	`"github.com/hemilabs/heminetwork/v2/hemi"`
`25`		`- "github.com/hemilabs/heminetwork/v2/testutil"`
	`25`	`+ "github.com/hemilabs/heminetwork/v2/internal/testutil"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`func TestMD(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ import (`
`29`	`29`	`"github.com/hemilabs/heminetwork/v2/database/tbcd"`
`30`	`30`	`"github.com/hemilabs/heminetwork/v2/hemi"`
`31`	`31`	`"github.com/hemilabs/heminetwork/v2/hemi/pop"`
	`32`	`+ "github.com/hemilabs/heminetwork/v2/internal/testutil"`
`32`	`33`	`"github.com/hemilabs/heminetwork/v2/service/tbc"`
`33`		`- "github.com/hemilabs/heminetwork/v2/testutil"`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`type TBCMockHandler struct {`