remove ugly private mockgen workaround

libp2p · Apr 12, 2023 · cf2e70d · cf2e70d
1 parent 865ebf4
commit cf2e70d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 79 deletions.
diff --git a/p2p/host/basic/mock_nat_test.go b/p2p/host/basic/mock_nat_test.go
diff --git a/p2p/host/basic/mockgen_private.sh b/p2p/host/basic/mockgen_private.sh
diff --git a/p2p/host/basic/mocks.go b/p2p/host/basic/mocks.go
@@ -0,0 +1,6 @@
+//go:build gomock
+// +build gomock
+
+package basichost
+
+type NAT nat
diff --git a/p2p/host/basic/natmgr_test.go b/p2p/host/basic/natmgr_test.go
@@ -15,12 +15,12 @@ import (
 	"github.com/golang/mock/gomock"
 )
 
-//go:generate sh -c "./mockgen_private.sh basichost mock_nat_test.go github.com/libp2p/go-libp2p/p2p/host/basic nat"
+//go:generate sh -c "go run github.com/golang/mock/mockgen -build_flags=\"-tags=gomock\" -package basichost -destination mock_nat_test.go github.com/libp2p/go-libp2p/p2p/host/basic NAT"
 
-func setupMockNAT(t *testing.T) (mockNAT *MockNat, reset func()) {
+func setupMockNAT(t *testing.T) (mockNAT *MockNAT, reset func()) {
 	t.Helper()
 	ctrl := gomock.NewController(t)
-	mockNAT = NewMockNat(ctrl)
+	mockNAT = NewMockNAT(ctrl)
 	origDiscoverNAT := discoverNAT
 	discoverNAT = func(ctx context.Context) (nat, error) { return mockNAT, nil }
 	return mockNAT, func() {