move testdata out of internal for re-use in integration tests

cosmos · May 31, 2023 · 91a9688 · 91a9688
1 parent 12d10ab
commit 91a9688
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 13 deletions.
diff --git a/tests/integration/aminojson/aminojson_test.go b/tests/integration/aminojson/aminojson_test.go
@@ -43,8 +43,8 @@ import (
 	ed25519types "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/multisig"
 	secp256k1types "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
-	gogo_testpb "github.com/cosmos/cosmos-sdk/tests/integration/aminojson/internal/gogo/testpb"
-	pulsar_testpb "github.com/cosmos/cosmos-sdk/tests/integration/aminojson/internal/pulsar/testpb"
+	gogo_testpb "github.com/cosmos/cosmos-sdk/tests/integration/aminojson/testdata/gogo/testpb"
+	pulsar_testpb "github.com/cosmos/cosmos-sdk/tests/integration/aminojson/testdata/pulsar/testpb"
 	"github.com/cosmos/cosmos-sdk/tests/integration/rapidgen"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	"github.com/cosmos/cosmos-sdk/types"

diff --git a/tests/integration/aminojson/repeated_test.go b/tests/integration/aminojson/repeated_test.go
@@ -10,9 +10,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"cosmossdk.io/x/tx/signing/aminojson"
+
 	"github.com/cosmos/cosmos-sdk/codec"
-	gogopb "github.com/cosmos/cosmos-sdk/tests/integration/aminojson/internal/gogo/testpb"
-	pulsarpb "github.com/cosmos/cosmos-sdk/tests/integration/aminojson/internal/pulsar/testpb"
+	gogopb "github.com/cosmos/cosmos-sdk/tests/integration/aminojson/testdata/gogo/testpb"
+	pulsarpb "github.com/cosmos/cosmos-sdk/tests/integration/aminojson/testdata/pulsar/testpb"
 )
 
 func TestRepeatedFields(t *testing.T) {

diff --git a/...s/integration/aminojson/internal/Makefile → ...s/integration/aminojson/testdata/Makefile b/...s/integration/aminojson/internal/Makefile → ...s/integration/aminojson/testdata/Makefile
diff --git a/...tion/aminojson/internal/buf.gen.gogo.yaml → ...tion/aminojson/testdata/buf.gen.gogo.yaml b/...tion/aminojson/internal/buf.gen.gogo.yaml → ...tion/aminojson/testdata/buf.gen.gogo.yaml
diff --git a/...on/aminojson/internal/buf.gen.pulsar.yaml → ...on/aminojson/testdata/buf.gen.pulsar.yaml b/...on/aminojson/internal/buf.gen.pulsar.yaml → ...on/aminojson/testdata/buf.gen.pulsar.yaml
diff --git a/...s/integration/aminojson/internal/buf.lock → ...s/integration/aminojson/testdata/buf.lock b/...s/integration/aminojson/internal/buf.lock → ...s/integration/aminojson/testdata/buf.lock
diff --git a/...s/integration/aminojson/internal/buf.yaml → ...s/integration/aminojson/testdata/buf.yaml b/...s/integration/aminojson/internal/buf.yaml → ...s/integration/aminojson/testdata/buf.yaml
diff --git a/...aminojson/internal/gogo/testpb/test.pb.go → ...aminojson/testdata/gogo/testpb/test.pb.go b/...aminojson/internal/gogo/testpb/test.pb.go → ...aminojson/testdata/gogo/testpb/test.pb.go
diff --git a/...son/internal/pulsar/testpb/test.pulsar.go → ...son/testdata/pulsar/testpb/test.pulsar.go b/...son/internal/pulsar/testpb/test.pulsar.go → ...son/testdata/pulsar/testpb/test.pulsar.go
diff --git a/...tion/aminojson/internal/testpb/test.proto → ...tion/aminojson/testdata/testpb/test.proto b/...tion/aminojson/internal/testpb/test.proto → ...tion/aminojson/testdata/testpb/test.proto
diff --git a/tests/integration/tx/context_test.go b/tests/integration/tx/context_test.go
@@ -0,0 +1,30 @@
+package tx
+
+import (
+	"testing"
+
+	"cosmossdk.io/x/tx/signing"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDefineCustomGetSigners(t *testing.T) {
+	customMsg := &testpb.CustomSignedMessage{}
+	signers := [][]byte{[]byte("foo")}
+
+	context, err := signing.NewContext(signing.Options{
+		AddressCodec:          dummyAddressCodec{},
+		ValidatorAddressCodec: dummyValidatorAddressCodec{},
+	})
+	require.NoError(t, err)
+
+	_, err = context.GetSigners(customMsg)
+	// before calling DefineCustomGetSigners, we should get an error
+	require.ErrorContains(t, err, "need custom signers function")
+	signing.DefineCustomGetSigners(context, func(msg *testpb.CustomSignedMessage) ([][]byte, error) {
+		return signers, nil
+	})
+	// after calling DefineCustomGetSigners, we should get the signers
+	gotSigners, err := context.GetSigners(customMsg)
+	require.NoError(t, err)
+	require.Equal(t, signers, gotSigners)
+}
diff --git a/x/tx/internal/testpb/1.proto b/x/tx/internal/testpb/1.proto
@@ -107,6 +107,7 @@ message Ballot {
   repeated WeightedBallotOption options = 4;
 }
 
+// TODO remove
 message CustomSignedMessage {
   option (cosmos.msg.v1.custom_signer) = true;
   string thing1 = 1;