chore: make testpb internal

Updates cosmos#37
elias-orijtech · Mar 23, 2023 · 858c748 · 858c748
1 parent 8cfa066
commit 858c748
Show file tree

Hide file tree

Showing 25 changed files with 147 additions and 144 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-DIRECTORIES_TO_BUILD := "./testpb ./internal/testprotos/test3"
+DIRECTORIES_TO_BUILD := "./internal/testpb ./internal/testprotos/test3"
 
 pulsar:
 	docker build -t dev:proto-build -f Dockerfile .

diff --git a/anyutil/any_test.go b/anyutil/any_test.go
@@ -11,7 +11,7 @@ import (
 	"google.golang.org/protobuf/types/known/anypb"
 
 	"github.com/cosmos/cosmos-proto/anyutil"
-	"github.com/cosmos/cosmos-proto/testpb"
+	"github.com/cosmos/cosmos-proto/internal/testpb"
 )
 
 func TestAny(t *testing.T) {

diff --git a/testpb/1.proto → internal/testpb/1.proto b/testpb/1.proto → internal/testpb/1.proto
@@ -1,8 +1,8 @@
 syntax="proto3";
 
-import "testpb/2.proto";
+import "internal/testpb/2.proto";
 
-option go_package = "github.com/cosmos/cosmos-proto/testpb";
+option go_package = "github.com/cosmos/cosmos-proto/internal/testpb";
 
 enum Enumeration {
   One = 0;

diff --git a/testpb/1.pulsar.go → internal/testpb/1.pulsar.go b/testpb/1.pulsar.go → internal/testpb/1.pulsar.go
diff --git a/internal/testpb/2.proto b/internal/testpb/2.proto
@@ -0,0 +1,6 @@
+syntax="proto3";
+option go_package = "github.com/cosmos/cosmos-proto/internal/testpb";
+
+message ImportedMessage {
+
+}
diff --git a/testpb/2.pulsar.go → internal/testpb/2.pulsar.go b/testpb/2.pulsar.go → internal/testpb/2.pulsar.go
diff --git a/testpb/clear_test.go → internal/testpb/clear_test.go b/testpb/clear_test.go → internal/testpb/clear_test.go
diff --git a/testpb/codec_test.go → internal/testpb/codec_test.go b/testpb/codec_test.go → internal/testpb/codec_test.go
diff --git a/testpb/get_test.go → internal/testpb/get_test.go b/testpb/get_test.go → internal/testpb/get_test.go
diff --git a/testpb/has_test.go → internal/testpb/has_test.go b/testpb/has_test.go → internal/testpb/has_test.go
diff --git a/testpb/list_bench_test.go → internal/testpb/list_bench_test.go b/testpb/list_bench_test.go → internal/testpb/list_bench_test.go
diff --git a/testpb/list_test.go → internal/testpb/list_test.go b/testpb/list_test.go → internal/testpb/list_test.go
diff --git a/testpb/map_bench_test.go → internal/testpb/map_bench_test.go b/testpb/map_bench_test.go → internal/testpb/map_bench_test.go
diff --git a/testpb/map_test.go → internal/testpb/map_test.go b/testpb/map_test.go → internal/testpb/map_test.go
diff --git a/testpb/mutable_test.go → internal/testpb/mutable_test.go b/testpb/mutable_test.go → internal/testpb/mutable_test.go
diff --git a/testpb/new_field_test.go → internal/testpb/new_field_test.go b/testpb/new_field_test.go → internal/testpb/new_field_test.go
diff --git a/testpb/proto_message_bench_test.go → internal/testpb/proto_message_bench_test.go b/testpb/proto_message_bench_test.go → internal/testpb/proto_message_bench_test.go
diff --git a/testpb/proto_methods_test.go → internal/testpb/proto_methods_test.go b/testpb/proto_methods_test.go → internal/testpb/proto_methods_test.go
diff --git a/testpb/range_test.go → internal/testpb/range_test.go b/testpb/range_test.go → internal/testpb/range_test.go
diff --git a/testpb/set_test.go → internal/testpb/set_test.go b/testpb/set_test.go → internal/testpb/set_test.go
diff --git a/testpb/type_bench_test.go → internal/testpb/type_bench_test.go b/testpb/type_bench_test.go → internal/testpb/type_bench_test.go
diff --git a/testpb/type_test.go → internal/testpb/type_test.go b/testpb/type_test.go → internal/testpb/type_test.go
diff --git a/testpb/whichoneof_test.go → internal/testpb/whichoneof_test.go b/testpb/whichoneof_test.go → internal/testpb/whichoneof_test.go
diff --git a/rapidproto/rapidproto_test.go b/rapidproto/rapidproto_test.go
@@ -10,8 +10,8 @@ import (
 	"gotest.tools/v3/golden"
 	"pgregory.net/rapid"
 
+	"github.com/cosmos/cosmos-proto/internal/testpb"
 	"github.com/cosmos/cosmos-proto/rapidproto"
-	"github.com/cosmos/cosmos-proto/testpb"
 )
 
 // TestRegression checks that the generator still produces the same output

diff --git a/testpb/2.proto b/testpb/2.proto