Merge branch 'main' into julien/kill-exp

cosmos · Aug 12, 2024 · aa8a527 · aa8a527
2 parents 2a9ee56 + a2d130f
commit aa8a527
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Improvements
 
 - [#145](https://github.com/cosmos/gogoproto/pull/145) Removing `x/exp` depencency for greater compatibility
+- [#144](https://github.com/cosmos/gogoproto/pull/144) Change proto.Message and jsonpb.Anyresolver to aliased types to allow different implementations of the same interface.
 
 ## [v1.6.0](https://github.com/cosmos/gogoproto/releases/tag/v1.6.0) - 2024-08-08
 

diff --git a/jsonpb/jsonpb.go b/jsonpb/jsonpb.go
@@ -88,7 +88,7 @@ type Marshaler struct {
 
 // AnyResolver takes a type URL, present in an Any message, and resolves it into
 // an instance of the associated message.
-type AnyResolver interface {
+type AnyResolver = interface {
 	Resolve(typeUrl string) (proto.Message, error)
 }
 

diff --git a/proto/lib.go b/proto/lib.go
@@ -335,7 +335,7 @@ func (nf *nonFatal) Merge(err error) (ok bool) {
 }
 
 // Message is implemented by generated protocol buffer messages.
-type Message interface {
+type Message = interface {
 	Reset()
 	String() string
 	ProtoMessage()