certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge PR #5750: Move Simapp Codec to Std

This commit is contained in:
Alexander Bezobchuk 2020-03-05 09:59:11 -05:00 committed by GitHub
parent 9acd722db2 69ba71c28d
commit ecc00bf9f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 138 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
simapp/codec/codec.go → codec/std/codec.go
View File

@ -1,4 +1,4 @@
package codec package std
import ( import (
"github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec"

148
simapp/codec/codec.pb.go → codec/std/codec.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT. // Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: simapp/codec/codec.proto // source: codec/std/codec.proto
package codec package std
import ( import (
fmt "fmt" fmt "fmt"
@ -53,7 +53,7 @@ func (m *Account) Reset() { *m = Account{} }
func (m *Account) String() string { return proto.CompactTextString(m) } func (m *Account) String() string { return proto.CompactTextString(m) }
func (*Account) ProtoMessage() {} func (*Account) ProtoMessage() {}
func (*Account) Descriptor() ([]byte, []int) { func (*Account) Descriptor() ([]byte, []int) {
return fileDescriptor_3c6d4085e4065f5a, []int{0} return fileDescriptor_daf09dc2dfa19bb4, []int{0}
} }
func (m *Account) XXX_Unmarshal(b []byte) error { func (m *Account) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -176,7 +176,7 @@ func (m *Supply) Reset() { *m = Supply{} }
func (m *Supply) String() string { return proto.CompactTextString(m) } func (m *Supply) String() string { return proto.CompactTextString(m) }
func (*Supply) ProtoMessage() {} func (*Supply) ProtoMessage() {}
func (*Supply) Descriptor() ([]byte, []int) { func (*Supply) Descriptor() ([]byte, []int) {
return fileDescriptor_3c6d4085e4065f5a, []int{1} return fileDescriptor_daf09dc2dfa19bb4, []int{1}
} }
func (m *Supply) XXX_Unmarshal(b []byte) error { func (m *Supply) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -253,7 +253,7 @@ func (m *Evidence) Reset() { *m = Evidence{} }
func (m *Evidence) String() string { return proto.CompactTextString(m) } func (m *Evidence) String() string { return proto.CompactTextString(m) }
func (*Evidence) ProtoMessage() {} func (*Evidence) ProtoMessage() {}
func (*Evidence) Descriptor() ([]byte, []int) { func (*Evidence) Descriptor() ([]byte, []int) {
return fileDescriptor_3c6d4085e4065f5a, []int{2} return fileDescriptor_daf09dc2dfa19bb4, []int{2}
} }
func (m *Evidence) XXX_Unmarshal(b []byte) error { func (m *Evidence) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -327,7 +327,7 @@ func (m *MsgSubmitEvidence) Reset() { *m = MsgSubmitEvidence{} }
func (m *MsgSubmitEvidence) String() string { return proto.CompactTextString(m) } func (m *MsgSubmitEvidence) String() string { return proto.CompactTextString(m) }
func (*MsgSubmitEvidence) ProtoMessage() {} func (*MsgSubmitEvidence) ProtoMessage() {}
func (*MsgSubmitEvidence) Descriptor() ([]byte, []int) { func (*MsgSubmitEvidence) Descriptor() ([]byte, []int) {
return fileDescriptor_3c6d4085e4065f5a, []int{3} return fileDescriptor_daf09dc2dfa19bb4, []int{3}
} }
func (m *MsgSubmitEvidence) XXX_Unmarshal(b []byte) error { func (m *MsgSubmitEvidence) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -367,7 +367,7 @@ func (m *MsgSubmitProposal) Reset() { *m = MsgSubmitProposal{} }
func (m *MsgSubmitProposal) String() string { return proto.CompactTextString(m) } func (m *MsgSubmitProposal) String() string { return proto.CompactTextString(m) }
func (*MsgSubmitProposal) ProtoMessage() {} func (*MsgSubmitProposal) ProtoMessage() {}
func (*MsgSubmitProposal) Descriptor() ([]byte, []int) { func (*MsgSubmitProposal) Descriptor() ([]byte, []int) {
return fileDescriptor_3c6d4085e4065f5a, []int{4} return fileDescriptor_daf09dc2dfa19bb4, []int{4}
} }
func (m *MsgSubmitProposal) XXX_Unmarshal(b []byte) error { func (m *MsgSubmitProposal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -407,7 +407,7 @@ func (m *Proposal) Reset() { *m = Proposal{} }
func (m *Proposal) String() string { return proto.CompactTextString(m) } func (m *Proposal) String() string { return proto.CompactTextString(m) }
func (*Proposal) ProtoMessage() {} func (*Proposal) ProtoMessage() {}
func (*Proposal) Descriptor() ([]byte, []int) { func (*Proposal) Descriptor() ([]byte, []int) {
return fileDescriptor_3c6d4085e4065f5a, []int{5} return fileDescriptor_daf09dc2dfa19bb4, []int{5}
} }
func (m *Proposal) XXX_Unmarshal(b []byte) error { func (m *Proposal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -461,7 +461,7 @@ func (m *Content) Reset() { *m = Content{} }
func (m *Content) String() string { return proto.CompactTextString(m) } func (m *Content) String() string { return proto.CompactTextString(m) }
func (*Content) ProtoMessage() {} func (*Content) ProtoMessage() {}
func (*Content) Descriptor() ([]byte, []int) { func (*Content) Descriptor() ([]byte, []int) {
return fileDescriptor_3c6d4085e4065f5a, []int{6} return fileDescriptor_daf09dc2dfa19bb4, []int{6}
} }
func (m *Content) XXX_Unmarshal(b []byte) error { func (m *Content) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@ -573,74 +573,74 @@ func (*Content) XXX_OneofWrappers() []interface{} {
} }
func init() { func init() {
proto.RegisterType((*Account)(nil), "cosmos_sdk.simapp.codec.v1.Account") proto.RegisterType((*Account)(nil), "cosmos_sdk.codec.std.v1.Account")
proto.RegisterType((*Supply)(nil), "cosmos_sdk.simapp.codec.v1.Supply") proto.RegisterType((*Supply)(nil), "cosmos_sdk.codec.std.v1.Supply")
proto.RegisterType((*Evidence)(nil), "cosmos_sdk.simapp.codec.v1.Evidence") proto.RegisterType((*Evidence)(nil), "cosmos_sdk.codec.std.v1.Evidence")
proto.RegisterType((*MsgSubmitEvidence)(nil), "cosmos_sdk.simapp.codec.v1.MsgSubmitEvidence") proto.RegisterType((*MsgSubmitEvidence)(nil), "cosmos_sdk.codec.std.v1.MsgSubmitEvidence")
proto.RegisterType((*MsgSubmitProposal)(nil), "cosmos_sdk.simapp.codec.v1.MsgSubmitProposal") proto.RegisterType((*MsgSubmitProposal)(nil), "cosmos_sdk.codec.std.v1.MsgSubmitProposal")
proto.RegisterType((*Proposal)(nil), "cosmos_sdk.simapp.codec.v1.Proposal") proto.RegisterType((*Proposal)(nil), "cosmos_sdk.codec.std.v1.Proposal")
proto.RegisterType((*Content)(nil), "cosmos_sdk.simapp.codec.v1.Content") proto.RegisterType((*Content)(nil), "cosmos_sdk.codec.std.v1.Content")
} }
func init() { proto.RegisterFile("simapp/codec/codec.proto", fileDescriptor_3c6d4085e4065f5a) } func init() { proto.RegisterFile("codec/std/codec.proto", fileDescriptor_daf09dc2dfa19bb4) }
var fileDescriptor_3c6d4085e4065f5a = []byte{ var fileDescriptor_daf09dc2dfa19bb4 = []byte{
// 878 bytes of a gzipped FileDescriptorProto // 875 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x41, 0x6f, 0xdc, 0x44, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x41, 0x6f, 0xdc, 0x44,
0x14, 0xb6, 0xa9, 0x9b, 0xac, 0xa6, 0x05, 0xca, 0x88, 0x92, 0xd5, 0x82, 0x76, 0xdb, 0x14, 0x2a, 0x14, 0xb6, 0xa9, 0x9b, 0xac, 0xa6, 0x05, 0xca, 0x88, 0x90, 0x28, 0xa0, 0x4d, 0x1a, 0x44, 0x84,
0x28, 0x8a, 0xdd, 0x52, 0xa0, 0xe9, 0x4a, 0xa8, 0x74, 0x97, 0xa2, 0x45, 0x22, 0x28, 0xda, 0x00, 0x8a, 0x62, 0xb7, 0x14, 0x68, 0xba, 0x12, 0x6a, 0xbb, 0x4b, 0xd1, 0x22, 0x11, 0x14, 0x6d, 0x80,
0x07, 0x04, 0xb2, 0xbc, 0xe3, 0xc1, 0x6b, 0xd5, 0xf6, 0x0c, 0x9e, 0xb1, 0xf1, 0xfe, 0x03, 0xc4, 0x03, 0x02, 0x59, 0xde, 0x99, 0xc1, 0x6b, 0xd5, 0xf6, 0x0c, 0x9e, 0xb1, 0xf1, 0xfe, 0x03, 0xc4,
0x89, 0x13, 0xe7, 0x88, 0x03, 0x47, 0x4e, 0x39, 0xf2, 0x03, 0xa2, 0x9c, 0x72, 0xe4, 0x14, 0xa1, 0x09, 0x89, 0x3f, 0x10, 0xc1, 0x91, 0x6b, 0x8f, 0xfc, 0x80, 0xaa, 0xa7, 0x1c, 0x39, 0x55, 0x28,
0xe4, 0xc2, 0xcf, 0x40, 0x9e, 0x19, 0x7b, 0x6d, 0xd9, 0xbb, 0x91, 0x7a, 0xb1, 0xd6, 0xf3, 0xbe, 0xb9, 0xf0, 0x33, 0x90, 0x67, 0xc6, 0x5e, 0x5b, 0xf6, 0x6e, 0xd4, 0xcb, 0xca, 0x9e, 0xf7, 0x7d,
0xef, 0x7d, 0xdf, 0x78, 0xe6, 0xbd, 0xb7, 0xa0, 0xcb, 0xfc, 0xd0, 0xa1, 0xd4, 0x42, 0xc4, 0xc5, 0xef, 0xfb, 0xc6, 0x33, 0xef, 0xbd, 0x05, 0x1b, 0x88, 0x62, 0x82, 0x1c, 0x2e, 0xb0, 0x23, 0x9f,
0x48, 0x3e, 0x4d, 0x1a, 0x13, 0x4e, 0x60, 0x0f, 0x11, 0x16, 0x12, 0x66, 0x33, 0xf7, 0xb9, 0x29, 0x6c, 0x96, 0x50, 0x41, 0xe1, 0x26, 0xa2, 0x3c, 0xa2, 0xdc, 0xe5, 0xf8, 0x89, 0xad, 0xd6, 0xb9,
0x41, 0xa6, 0x0c, 0xa7, 0x0f, 0x7a, 0xef, 0xf3, 0xb9, 0x1f, 0xbb, 0x36, 0x75, 0x62, 0xbe, 0xb0, 0xc0, 0x76, 0x76, 0x67, 0xfb, 0x03, 0x31, 0x0b, 0x12, 0xec, 0x32, 0x2f, 0x11, 0x73, 0x47, 0x62,
0x04, 0xdc, 0x92, 0xe8, 0x9d, 0xea, 0x8b, 0x4c, 0xd4, 0xbb, 0xdb, 0x04, 0x7b, 0xc4, 0x23, 0xcb, 0x1d, 0x05, 0x3d, 0xa8, 0xbf, 0xa8, 0x2c, 0xdb, 0xfb, 0x6d, 0xb0, 0x4f, 0x7d, 0xba, 0x78, 0xd2,
0x5f, 0x0a, 0xd7, 0xcd, 0x2c, 0x27, 0xe1, 0x73, 0x8b, 0x2f, 0x28, 0x66, 0xf2, 0xa9, 0x22, 0xb7, 0xb8, 0xad, 0xdc, 0xf1, 0x52, 0x31, 0x73, 0xc4, 0x9c, 0x11, 0xae, 0x7e, 0x75, 0x64, 0x57, 0x47,
0x54, 0x24, 0xc5, 0x8c, 0xfb, 0x91, 0xd7, 0x82, 0xe8, 0x65, 0x16, 0x4b, 0x28, 0x0d, 0x16, 0x2d, 0x32, 0xc2, 0x45, 0x10, 0xfb, 0x1d, 0x88, 0xed, 0xdc, 0xe1, 0x29, 0x63, 0xe1, 0xbc, 0x23, 0xf6,
0xb1, 0xb7, 0x32, 0x0b, 0xa7, 0xbe, 0x8b, 0x23, 0x84, 0x5b, 0xa2, 0x5b, 0x99, 0xe5, 0x91, 0xb4, 0x4e, 0xee, 0x90, 0x2c, 0xc0, 0x24, 0x46, 0xa4, 0x23, 0xba, 0x99, 0x3b, 0x3e, 0xcd, 0x3a, 0x02,
0x25, 0x70, 0x27, 0xb3, 0xa8, 0x13, 0x3b, 0xa1, 0x5a, 0xcd, 0x9d, 0x53, 0xc2, 0x9c, 0xa0, 0x06, 0xef, 0xe6, 0x0e, 0xf3, 0x12, 0x2f, 0xd2, 0xab, 0x85, 0x73, 0x46, 0xb9, 0x17, 0x36, 0x40, 0x6f,
0x7a, 0x33, 0xb3, 0x12, 0xea, 0xc5, 0x8e, 0x8b, 0xdb, 0x6d, 0xbb, 0x3e, 0xe3, 0xb1, 0x3f, 0x4b, 0xe7, 0x4e, 0xca, 0xfc, 0xc4, 0xc3, 0xa4, 0xdb, 0x36, 0x0e, 0xb8, 0x48, 0x82, 0x69, 0x2a, 0x02,
0xb8, 0x4f, 0xa2, 0x26, 0x62, 0xfb, 0x6f, 0x03, 0x6c, 0x3e, 0x45, 0x88, 0x24, 0x11, 0x87, 0x9f, 0x1a, 0xb7, 0x11, 0x7b, 0x7f, 0x5b, 0x60, 0xfd, 0x11, 0x42, 0x34, 0x8d, 0x05, 0xfc, 0x1c, 0x5c,
0x83, 0xeb, 0x33, 0x87, 0x61, 0xdb, 0x91, 0xef, 0x5d, 0xfd, 0x96, 0xfe, 0xee, 0xb5, 0x0f, 0x6e, 0x9f, 0x7a, 0x9c, 0xb8, 0x9e, 0x7a, 0xdf, 0x32, 0x77, 0xcd, 0xf7, 0xaf, 0x7d, 0x78, 0xd3, 0xae,
0x9b, 0x95, 0x63, 0xc8, 0xcc, 0xfc, 0x33, 0x98, 0xe9, 0x03, 0x73, 0xe4, 0x30, 0xac, 0x88, 0x13, 0x9d, 0x41, 0x6e, 0x17, 0x9f, 0xc1, 0xce, 0xee, 0xd8, 0x43, 0x8f, 0x13, 0x4d, 0x1c, 0x1b, 0x93,
0x6d, 0x7a, 0x6d, 0xb6, 0x7c, 0x85, 0x29, 0xe8, 0x21, 0x12, 0x71, 0x3f, 0x4a, 0x48, 0xc2, 0x6c, 0x6b, 0xd3, 0xc5, 0x2b, 0xcc, 0xc0, 0x36, 0xa2, 0xb1, 0x08, 0xe2, 0x94, 0xa6, 0xdc, 0xd5, 0x9f,
0xf5, 0xc9, 0xca, 0xac, 0x2f, 0x89, 0xac, 0x1f, 0xb7, 0x65, 0x95, 0xc8, 0x3c, 0xfb, 0xb8, 0xe4, 0xac, 0xca, 0xfa, 0x8a, 0xcc, 0xfa, 0x49, 0x57, 0x56, 0x85, 0x2c, 0xb2, 0x8f, 0x2a, 0xfe, 0xb7,
0x7f, 0x2b, 0x17, 0x97, 0x52, 0x5d, 0xb4, 0x22, 0x06, 0x43, 0xb0, 0xe5, 0xe2, 0xc0, 0x59, 0x60, 0x6a, 0x71, 0x21, 0xb5, 0x85, 0x96, 0xc4, 0x60, 0x04, 0x36, 0x31, 0x09, 0xbd, 0x39, 0xc1, 0x2d,
0xb7, 0x21, 0x7a, 0x45, 0x88, 0x3e, 0x5c, 0x2f, 0xfa, 0x99, 0x24, 0x37, 0x14, 0x6f, 0xba, 0x6d, 0xd1, 0x2b, 0x52, 0xf4, 0xee, 0x6a, 0xd1, 0xcf, 0x14, 0xb9, 0xa5, 0xb8, 0x81, 0xbb, 0x02, 0x90,
0x01, 0x48, 0x41, 0x97, 0xe2, 0xd8, 0x27, 0xae, 0x8f, 0x1a, 0x7a, 0x86, 0xd0, 0xfb, 0x70, 0xbd, 0x81, 0x2d, 0x46, 0x92, 0x80, 0xe2, 0x00, 0xb5, 0xf4, 0x2c, 0xa9, 0xf7, 0xd1, 0x6a, 0xbd, 0x63,
0xde, 0xbe, 0x62, 0x37, 0x04, 0xdf, 0xa0, 0xad, 0x11, 0xf8, 0x15, 0x78, 0x25, 0x24, 0x6e, 0x12, 0xcd, 0x6e, 0x09, 0xbe, 0xc5, 0x3a, 0x23, 0xf0, 0x2b, 0xf0, 0x5a, 0x44, 0x71, 0x1a, 0x2e, 0x8e,
0x2c, 0x8f, 0xe8, 0xaa, 0xd0, 0x79, 0xa7, 0xae, 0x23, 0xef, 0x61, 0xae, 0xb0, 0x27, 0xd0, 0xcb, 0xe8, 0xaa, 0xd4, 0x79, 0xaf, 0xa9, 0xa3, 0xee, 0x61, 0xa1, 0x70, 0x24, 0xd1, 0x8b, 0xc4, 0xaf,
0xc4, 0x2f, 0x87, 0xd5, 0x85, 0xe1, 0xe3, 0x93, 0xa3, 0x9d, 0x8f, 0xee, 0x79, 0x3e, 0x9f, 0x27, 0x46, 0xf5, 0x85, 0xc1, 0xfd, 0xe7, 0x4f, 0x0f, 0x3e, 0xbe, 0xe5, 0x07, 0x62, 0x96, 0x4e, 0x6d,
0x33, 0x13, 0x91, 0x50, 0x55, 0x4d, 0x51, 0x49, 0xcc, 0x7d, 0x6e, 0xa9, 0x7b, 0x8f, 0x33, 0x4a, 0x44, 0x23, 0x5d, 0x35, 0x65, 0x25, 0x71, 0xfc, 0xc4, 0xd1, 0xf7, 0x9e, 0xe4, 0x8c, 0x26, 0x82,
0x62, 0x8e, 0x5d, 0x53, 0x51, 0x47, 0x57, 0xc1, 0x15, 0x96, 0x84, 0xdb, 0xbf, 0xea, 0x60, 0xe3, 0x60, 0x5b, 0x53, 0x87, 0x57, 0xc1, 0x15, 0x9e, 0x46, 0x7b, 0xbf, 0x9a, 0x60, 0xed, 0x44, 0xca,
0x40, 0xc8, 0xc1, 0x5d, 0xb0, 0x21, 0x85, 0xd5, 0xbd, 0xe9, 0xaf, 0x32, 0x25, 0xf1, 0x13, 0x6d, 0xc1, 0x43, 0xb0, 0xa6, 0x84, 0xf5, 0xbd, 0xe9, 0x2f, 0x33, 0xa5, 0xf0, 0x63, 0x63, 0xa2, 0xf1,
0xaa, 0xf0, 0xc3, 0x27, 0xff, 0x1d, 0x0e, 0xf4, 0x93, 0xa3, 0x9d, 0x47, 0x97, 0x59, 0x51, 0x05, 0x83, 0x07, 0xff, 0x9d, 0xee, 0x98, 0xcf, 0x9f, 0x1e, 0xdc, 0xbb, 0xcc, 0x8a, 0x2e, 0xb0, 0xca,
0x56, 0x9a, 0x91, 0x99, 0xbe, 0x28, 0xcc, 0xfc, 0xa1, 0x83, 0xce, 0x33, 0x55, 0x67, 0xf0, 0x4b, 0x8c, 0xca, 0xf4, 0x45, 0x69, 0xe6, 0x0f, 0x13, 0xf4, 0x1e, 0xeb, 0x3a, 0x83, 0x5f, 0x82, 0xeb,
0x70, 0x1d, 0xff, 0x94, 0xf8, 0x29, 0x41, 0x4e, 0x7e, 0xf5, 0x95, 0xa9, 0xbb, 0x75, 0x53, 0x45, 0xe4, 0xa7, 0x34, 0xc8, 0x28, 0xf2, 0x8a, 0xab, 0xaf, 0x4d, 0xed, 0x37, 0x4d, 0x95, 0x55, 0x59,
0x55, 0xe6, 0xb6, 0x9e, 0x55, 0xd0, 0x13, 0x6d, 0x5a, 0x63, 0x0f, 0x9f, 0x2a, 0x8b, 0x8f, 0x2f, 0xd8, 0x7a, 0x5c, 0x43, 0x8f, 0x8d, 0x49, 0x83, 0x3d, 0x78, 0xa4, 0x2d, 0xde, 0xbf, 0xc4, 0x61,
0x71, 0x58, 0x96, 0x79, 0xe9, 0xb1, 0x30, 0x54, 0x98, 0xfc, 0x4b, 0x07, 0xaf, 0xed, 0x31, 0xef, 0x55, 0xe6, 0x95, 0xc7, 0xd2, 0x50, 0x69, 0xf2, 0x2f, 0x13, 0xbc, 0x71, 0xc4, 0xfd, 0x93, 0x74,
0x20, 0x99, 0x85, 0x3e, 0x2f, 0xdd, 0x7e, 0x0a, 0x3a, 0x05, 0x55, 0x39, 0x7d, 0xdb, 0x5c, 0xdd, 0x1a, 0x05, 0xa2, 0x72, 0xfb, 0x29, 0xe8, 0x95, 0xd4, 0xae, 0xb2, 0xab, 0xb7, 0xbe, 0x2a, 0xe3,
0xfd, 0xca, 0xa4, 0xd3, 0x92, 0x05, 0xf7, 0x80, 0x91, 0xd7, 0xa0, 0x2a, 0x2f, 0x6b, 0xf5, 0x3e, 0xa4, 0xa2, 0xc0, 0x23, 0x60, 0x15, 0x05, 0xa8, 0x6b, 0xcb, 0x59, 0xbe, 0xc9, 0x96, 0x72, 0x51,
0x1b, 0xe2, 0x79, 0x25, 0x8f, 0x3a, 0xc7, 0x67, 0x03, 0xed, 0xf4, 0x6c, 0xa0, 0x4f, 0x45, 0x9a, 0xc6, 0xc3, 0xde, 0xb3, 0x17, 0x3b, 0xc6, 0xd9, 0x8b, 0x1d, 0x73, 0x22, 0xd3, 0x0c, 0x7a, 0xbf,
0x61, 0xe7, 0x97, 0xc3, 0x81, 0x96, 0x6f, 0x7a, 0xfb, 0xcf, 0xaa, 0xe1, 0x7d, 0xd5, 0x82, 0xe0, 0x9c, 0xee, 0x18, 0xc5, 0x8e, 0xf7, 0xfe, 0xac, 0xbb, 0x3d, 0xd6, 0xfd, 0x07, 0x8e, 0xb5, 0x9c,
0x44, 0xc9, 0x49, 0xb3, 0xf7, 0xea, 0x72, 0x1e, 0x49, 0x6b, 0x4a, 0x05, 0xab, 0x4d, 0x09, 0x7e, 0x72, 0x7a, 0xab, 0x29, 0xe7, 0xd3, 0xac, 0xa1, 0x54, 0xb2, 0xba, 0x94, 0xe0, 0x00, 0xac, 0x17,
0x02, 0x36, 0xf3, 0x8a, 0xc6, 0x65, 0x6b, 0xb8, 0xb3, 0x6e, 0xe7, 0x63, 0x09, 0x9d, 0x16, 0x9c, 0xe5, 0x4c, 0xaa, 0xbe, 0xb0, 0xbb, 0x74, 0xdb, 0x23, 0x85, 0x9b, 0x94, 0x84, 0x9a, 0xcb, 0xdf,
0x8a, 0xd1, 0xdf, 0x75, 0xd0, 0x29, 0xfd, 0x3d, 0xa9, 0xf9, 0xbb, 0xdd, 0xea, 0x6f, 0xad, 0xad, 0x4d, 0xd0, 0xab, 0xcc, 0x3d, 0x68, 0x98, 0xbb, 0xd9, 0x69, 0x6e, 0xa5, 0xa7, 0x87, 0x2f, 0xed,
0xf1, 0x8b, 0xd8, 0x1a, 0x19, 0x79, 0x96, 0xa5, 0x39, 0x43, 0x18, 0x3b, 0x34, 0xc0, 0xa6, 0x02, 0x69, 0x68, 0x15, 0x29, 0x16, 0xce, 0x2c, 0xe9, 0xea, 0xd4, 0x02, 0xeb, 0x1a, 0x00, 0xef, 0x01,
0xc0, 0x47, 0xc0, 0xe0, 0x38, 0xe3, 0x6b, 0x7d, 0x7d, 0x8d, 0xb3, 0xf2, 0x93, 0x4d, 0xb4, 0xa9, 0x4b, 0x90, 0x5c, 0xac, 0x34, 0xf5, 0x35, 0xc9, 0xab, 0x8f, 0x35, 0x36, 0x26, 0x92, 0x00, 0xbf,
0x20, 0xc0, 0xef, 0xc1, 0x0d, 0x31, 0x0c, 0x30, 0xc7, 0xb1, 0x8d, 0xe6, 0x4e, 0xe4, 0xad, 0x38, 0x07, 0x37, 0xe4, 0x0c, 0x20, 0x82, 0x24, 0x2e, 0x9a, 0x79, 0xb1, 0xbf, 0xe4, 0x94, 0xd5, 0xa4,
0x6b, 0x39, 0x32, 0xc4, 0xfe, 0x0a, 0xfc, 0x58, 0xc0, 0x2b, 0x29, 0x5f, 0xa5, 0xf5, 0x10, 0xfc, 0x90, 0x9b, 0x2b, 0xf1, 0x23, 0x09, 0xaf, 0xa5, 0x7c, 0x9d, 0x35, 0x43, 0xf0, 0x07, 0x70, 0x83,
0x01, 0xdc, 0x60, 0xe4, 0x47, 0xfe, 0xb3, 0x13, 0x63, 0x5b, 0x8d, 0x13, 0xd5, 0x33, 0xef, 0xd7, 0xd3, 0x1f, 0xc5, 0xcf, 0x5e, 0x42, 0x5c, 0x3d, 0x45, 0x74, 0xab, 0xbc, 0xdd, 0xcc, 0xae, 0x83,
0xb3, 0xab, 0xa0, 0xa8, 0x63, 0x45, 0xf8, 0x46, 0x2e, 0x55, 0xd3, 0xb3, 0x7a, 0x08, 0x52, 0xb0, 0xb2, 0x7c, 0x35, 0xe1, 0x1b, 0xb5, 0x54, 0x4f, 0xcf, 0x9b, 0x21, 0xc8, 0xc0, 0x26, 0xf2, 0x62,
0x85, 0x9c, 0x08, 0xe1, 0xc0, 0x6e, 0xa8, 0x18, 0x6d, 0xe3, 0xa0, 0xa2, 0x32, 0x16, 0xbc, 0xd5, 0x44, 0x42, 0xb7, 0xa5, 0x62, 0x75, 0x4d, 0x81, 0x9a, 0xca, 0x48, 0xf2, 0x96, 0x6b, 0x6d, 0xa0,
0x5a, 0x37, 0x51, 0x1b, 0x00, 0x06, 0xe0, 0x75, 0x44, 0xc2, 0x30, 0x89, 0x7c, 0xbe, 0xb0, 0x29, 0x2e, 0x00, 0x0c, 0xc1, 0x9b, 0x88, 0x46, 0x51, 0x1a, 0x07, 0x62, 0xee, 0x32, 0x4a, 0x43, 0x97,
0x21, 0x81, 0xcd, 0x28, 0x8e, 0x5c, 0xd5, 0x30, 0x77, 0xeb, 0x72, 0xd5, 0x19, 0x29, 0x4f, 0x53, 0x33, 0x12, 0x63, 0xdd, 0x27, 0x0f, 0x9b, 0x72, 0xf5, 0xd1, 0xa8, 0x4e, 0x53, 0x33, 0x8f, 0x29,
0x31, 0xf7, 0x09, 0x09, 0x0e, 0x72, 0x5e, 0x45, 0x10, 0xa2, 0x46, 0x74, 0xb8, 0xab, 0xda, 0xc3, 0x0d, 0x4f, 0x0a, 0x5e, 0x4d, 0x10, 0xa2, 0x56, 0x74, 0x70, 0xa8, 0xbb, 0xc2, 0xed, 0x4b, 0xba,
0xfd, 0x4b, 0xda, 0x43, 0x39, 0xe7, 0xcb, 0x0b, 0x23, 0xbb, 0xc2, 0x68, 0x7c, 0x7c, 0xde, 0xd7, 0x42, 0x35, 0xde, 0xab, 0x0b, 0xa3, 0x9a, 0xc1, 0xf0, 0xe1, 0xb3, 0xf3, 0xbe, 0x79, 0x76, 0xde,
0x4f, 0xcf, 0xfb, 0xfa, 0xbf, 0xe7, 0x7d, 0xfd, 0xb7, 0x8b, 0xbe, 0x76, 0x7a, 0xd1, 0xd7, 0xfe, 0x37, 0xff, 0x3d, 0xef, 0x9b, 0xbf, 0x5d, 0xf4, 0x8d, 0xb3, 0x8b, 0xbe, 0xf1, 0xcf, 0x45, 0xdf,
0xb9, 0xe8, 0x6b, 0xdf, 0xbd, 0xb7, 0x36, 0x65, 0xf5, 0xbf, 0xd3, 0x6c, 0x43, 0x8c, 0xf4, 0x87, 0xf8, 0x6e, 0x7f, 0x65, 0xca, 0xea, 0xcf, 0xd2, 0x74, 0x4d, 0x8e, 0xf1, 0xbb, 0xff, 0x07, 0x00,
0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x70, 0x52, 0xf3, 0x25, 0x52, 0x09, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf7, 0xf2, 0xb6, 0xa2, 0x40, 0x09, 0x00, 0x00,
} }
func (this *Supply) Equal(that interface{}) bool { func (this *Supply) Equal(that interface{}) bool {

4
simapp/codec/codec.proto → codec/std/codec.proto
View File

@ -1,5 +1,5 @@
syntax = "proto3"; syntax = "proto3";
package cosmos_sdk.simapp.codec.v1; package cosmos_sdk.codec.std.v1;
import "third_party/proto/cosmos-proto/cosmos.proto"; import "third_party/proto/cosmos-proto/cosmos.proto";
import "third_party/proto/gogoproto/gogo.proto"; import "third_party/proto/gogoproto/gogo.proto";
@ -12,7 +12,7 @@ import "x/params/types/proposal/types.proto";
import "x/upgrade/types/types.proto"; import "x/upgrade/types/types.proto";
import "x/distribution/types/types.proto"; import "x/distribution/types/types.proto";
option go_package = "github.com/cosmos/cosmos-sdk/simapp/codec"; option go_package = "github.com/cosmos/cosmos-sdk/codec/std";
// Account defines the application-level Account type. // Account defines the application-level Account type.
message Account { message Account {

10
codec/std/doc.go Normal file
View File

@ -0,0 +1,10 @@
/*
Package std defines all the common and standard Cosmos SDK Protocol Buffer
message definitions and type implementations. The std package defines and exposes
a single concrete Codec type that implements all the necessary module codec
interfaces along with all the types necessary to use those modules.
Applications can choose to either use the codec directly or even extend it without
having the need to redefine all the message and type implementations.
*/
package std

2
simapp/codec/msgs.go → codec/std/msgs.go
View File

@ -1,4 +1,4 @@
package codec package std
import ( import (
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"

7
simapp/app.go
View File

@ -11,7 +11,7 @@ import (
bam "github.com/cosmos/cosmos-sdk/baseapp" bam "github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" codecstd "github.com/cosmos/cosmos-sdk/codec/std"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/version" "github.com/cosmos/cosmos-sdk/version"
@ -126,9 +126,8 @@ func NewSimApp(
) *SimApp { ) *SimApp {
// TODO: Remove cdc in favor of appCodec once all modules are migrated. // TODO: Remove cdc in favor of appCodec once all modules are migrated.
cdc := simappcodec.MakeCodec(ModuleBasics) cdc := codecstd.MakeCodec(ModuleBasics)
appCodec := codecstd.NewAppCodec(cdc)
appCodec := simappcodec.NewAppCodec(cdc)
bApp := bam.NewBaseApp(appName, logger, db, auth.DefaultTxDecoder(cdc), baseAppOptions...) bApp := bam.NewBaseApp(appName, logger, db, auth.DefaultTxDecoder(cdc), baseAppOptions...)
bApp.SetCommitMultiStoreTracer(traceStore) bApp.SetCommitMultiStoreTracer(traceStore)

5
simapp/genesis.go
View File

@ -3,7 +3,7 @@ package simapp
import ( import (
"encoding/json" "encoding/json"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" codecstd "github.com/cosmos/cosmos-sdk/codec/std"
) )
// The genesis state of the blockchain is represented here as a map of raw json // The genesis state of the blockchain is represented here as a map of raw json
@ -17,7 +17,6 @@ type GenesisState map[string]json.RawMessage
// NewDefaultGenesisState generates the default state for the application. // NewDefaultGenesisState generates the default state for the application.
func NewDefaultGenesisState() GenesisState { func NewDefaultGenesisState() GenesisState {
cdc := simappcodec.MakeCodec(ModuleBasics) cdc := codecstd.MakeCodec(ModuleBasics)
return ModuleBasics.DefaultGenesis(cdc) return ModuleBasics.DefaultGenesis(cdc)
} }

4
simapp/utils_test.go
View File

@ -8,13 +8,13 @@ import (
tmkv "github.com/tendermint/tendermint/libs/kv" tmkv "github.com/tendermint/tendermint/libs/kv"
"github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" codecstd "github.com/cosmos/cosmos-sdk/codec/std"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/auth"
) )
func TestGetSimulationLog(t *testing.T) { func TestGetSimulationLog(t *testing.T) {
cdc := simappcodec.MakeCodec(ModuleBasics) cdc := codecstd.MakeCodec(ModuleBasics)
decoders := make(sdk.StoreDecoderRegistry) decoders := make(sdk.StoreDecoderRegistry)
decoders[auth.StoreKey] = func(cdc *codec.Codec, kvAs, kvBs tmkv.Pair) string { return "10" } decoders[auth.StoreKey] = func(cdc *codec.Codec, kvAs, kvBs tmkv.Pair) string { return "10" }

4
x/auth/types/common_test.go
View File

@ -1,11 +1,11 @@
package types_test package types_test
import ( import (
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
) )
var ( var (
app = simapp.Setup(false) app = simapp.Setup(false)
appCodec = simappcodec.NewAppCodec(app.Codec()) appCodec = codecstd.NewAppCodec(app.Codec())
) )

4
x/auth/vesting/types/common_test.go
View File

@ -1,11 +1,11 @@
package types_test package types_test
import ( import (
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
) )
var ( var (
app = simapp.Setup(false) app = simapp.Setup(false)
appCodec = simappcodec.NewAppCodec(app.Codec()) appCodec = codecstd.NewAppCodec(app.Codec())
) )

10
x/evidence/handler_test.go
View File

@ -10,8 +10,8 @@ import (
abci "github.com/tendermint/tendermint/abci/types" abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/crypto/ed25519"
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/evidence" "github.com/cosmos/cosmos-sdk/x/evidence"
"github.com/cosmos/cosmos-sdk/x/evidence/exported" "github.com/cosmos/cosmos-sdk/x/evidence/exported"
@ -25,8 +25,8 @@ type HandlerTestSuite struct {
app *simapp.SimApp app *simapp.SimApp
} }
func testMsgSubmitEvidence(r *require.Assertions, e exported.Evidence, s sdk.AccAddress) simappcodec.MsgSubmitEvidence { func testMsgSubmitEvidence(r *require.Assertions, e exported.Evidence, s sdk.AccAddress) codecstd.MsgSubmitEvidence {
msg, err := simappcodec.NewMsgSubmitEvidence(e, s) msg, err := codecstd.NewMsgSubmitEvidence(e, s)
r.NoError(err) r.NoError(err)
return msg return msg
} }
@ -55,7 +55,7 @@ func (suite *HandlerTestSuite) SetupTest() {
// recreate keeper in order to use custom testing types // recreate keeper in order to use custom testing types
evidenceKeeper := evidence.NewKeeper( evidenceKeeper := evidence.NewKeeper(
simappcodec.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey), codecstd.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey),
app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper, app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper,
) )
router := evidence.NewRouter() router := evidence.NewRouter()
@ -118,7 +118,7 @@ func (suite *HandlerTestSuite) TestMsgSubmitEvidence() {
suite.Require().NoError(err, "unexpected error; tc #%d", i) suite.Require().NoError(err, "unexpected error; tc #%d", i)
suite.Require().NotNil(res, "expected non-nil result; tc #%d", i) suite.Require().NotNil(res, "expected non-nil result; tc #%d", i)
msg := tc.msg.(simappcodec.MsgSubmitEvidence) msg := tc.msg.(codecstd.MsgSubmitEvidence)
suite.Require().Equal(msg.GetEvidence().Hash().Bytes(), res.Data, "invalid hash; tc #%d", i) suite.Require().Equal(msg.GetEvidence().Hash().Bytes(), res.Data, "invalid hash; tc #%d", i)
} }
} }

4
x/evidence/keeper/keeper_test.go
View File

@ -6,8 +6,8 @@ import (
"testing" "testing"
"time" "time"
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/auth"
"github.com/cosmos/cosmos-sdk/x/evidence" "github.com/cosmos/cosmos-sdk/x/evidence"
@ -83,7 +83,7 @@ func (suite *KeeperTestSuite) SetupTest() {
// recreate keeper in order to use custom testing types // recreate keeper in order to use custom testing types
evidenceKeeper := evidence.NewKeeper( evidenceKeeper := evidence.NewKeeper(
simappcodec.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey), codecstd.NewAppCodec(app.Codec()), app.GetKey(evidence.StoreKey),
app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper, app.GetSubspace(evidence.ModuleName), app.StakingKeeper, app.SlashingKeeper,
) )
router := evidence.NewRouter() router := evidence.NewRouter()

10
x/evidence/keeper/querier_test.go
View File

@ -3,7 +3,7 @@ package keeper_test
import ( import (
"strings" "strings"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/x/evidence/exported" "github.com/cosmos/cosmos-sdk/x/evidence/exported"
"github.com/cosmos/cosmos-sdk/x/evidence/types" "github.com/cosmos/cosmos-sdk/x/evidence/types"
@ -17,7 +17,7 @@ const (
func (suite *KeeperTestSuite) TestQueryEvidence_Existing() { func (suite *KeeperTestSuite) TestQueryEvidence_Existing() {
ctx := suite.ctx.WithIsCheckTx(false) ctx := suite.ctx.WithIsCheckTx(false)
numEvidence := 100 numEvidence := 100
cdc := simappcodec.NewAppCodec(suite.app.Codec()) cdc := codecstd.NewAppCodec(suite.app.Codec())
evidence := suite.populateEvidence(ctx, numEvidence) evidence := suite.populateEvidence(ctx, numEvidence)
query := abci.RequestQuery{ query := abci.RequestQuery{
@ -36,7 +36,7 @@ func (suite *KeeperTestSuite) TestQueryEvidence_Existing() {
func (suite *KeeperTestSuite) TestQueryEvidence_NonExisting() { func (suite *KeeperTestSuite) TestQueryEvidence_NonExisting() {
ctx := suite.ctx.WithIsCheckTx(false) ctx := suite.ctx.WithIsCheckTx(false)
cdc := simappcodec.NewAppCodec(suite.app.Codec()) cdc := codecstd.NewAppCodec(suite.app.Codec())
numEvidence := 100 numEvidence := 100
suite.populateEvidence(ctx, numEvidence) suite.populateEvidence(ctx, numEvidence)
@ -52,7 +52,7 @@ func (suite *KeeperTestSuite) TestQueryEvidence_NonExisting() {
func (suite *KeeperTestSuite) TestQueryAllEvidence() { func (suite *KeeperTestSuite) TestQueryAllEvidence() {
ctx := suite.ctx.WithIsCheckTx(false) ctx := suite.ctx.WithIsCheckTx(false)
cdc := simappcodec.NewAppCodec(suite.app.Codec()) cdc := codecstd.NewAppCodec(suite.app.Codec())
numEvidence := 100 numEvidence := 100
suite.populateEvidence(ctx, numEvidence) suite.populateEvidence(ctx, numEvidence)
@ -72,7 +72,7 @@ func (suite *KeeperTestSuite) TestQueryAllEvidence() {
func (suite *KeeperTestSuite) TestQueryAllEvidence_InvalidPagination() { func (suite *KeeperTestSuite) TestQueryAllEvidence_InvalidPagination() {
ctx := suite.ctx.WithIsCheckTx(false) ctx := suite.ctx.WithIsCheckTx(false)
cdc := simappcodec.NewAppCodec(suite.app.Codec()) cdc := codecstd.NewAppCodec(suite.app.Codec())
numEvidence := 100 numEvidence := 100
suite.populateEvidence(ctx, numEvidence) suite.populateEvidence(ctx, numEvidence)

4
x/evidence/types/codec_test.go
View File

@ -7,15 +7,15 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/crypto/ed25519"
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
"github.com/cosmos/cosmos-sdk/x/evidence/exported" "github.com/cosmos/cosmos-sdk/x/evidence/exported"
"github.com/cosmos/cosmos-sdk/x/evidence/types" "github.com/cosmos/cosmos-sdk/x/evidence/types"
) )
func TestCodec(t *testing.T) { func TestCodec(t *testing.T) {
app := simapp.Setup(false) app := simapp.Setup(false)
appCodec := simappcodec.NewAppCodec(app.Codec()) appCodec := codecstd.NewAppCodec(app.Codec())
pk := ed25519.GenPrivKey() pk := ed25519.GenPrivKey()
var e exported.Evidence = &types.Equivocation{ var e exported.Evidence = &types.Equivocation{

6
x/evidence/types/msgs_test.go
View File

@ -4,7 +4,7 @@ import (
"testing" "testing"
"time" "time"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" codecstd "github.com/cosmos/cosmos-sdk/codec/std"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/evidence/exported" "github.com/cosmos/cosmos-sdk/x/evidence/exported"
"github.com/cosmos/cosmos-sdk/x/evidence/types" "github.com/cosmos/cosmos-sdk/x/evidence/types"
@ -13,8 +13,8 @@ import (
"github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/crypto/ed25519"
) )
func testMsgSubmitEvidence(t *testing.T, e exported.Evidence, s sdk.AccAddress) simappcodec.MsgSubmitEvidence { func testMsgSubmitEvidence(t *testing.T, e exported.Evidence, s sdk.AccAddress) codecstd.MsgSubmitEvidence {
msg, err := simappcodec.NewMsgSubmitEvidence(e, s) msg, err := codecstd.NewMsgSubmitEvidence(e, s)
require.NoError(t, err) require.NoError(t, err)
return msg return msg
} }

12
x/gov/abci_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
abci "github.com/tendermint/tendermint/abci/types" abci "github.com/tendermint/tendermint/abci/types"
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/gov" "github.com/cosmos/cosmos-sdk/x/gov"
"github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/staking"
@ -28,7 +28,7 @@ func TestTickExpiredDepositPeriod(t *testing.T) {
require.False(t, inactiveQueue.Valid()) require.False(t, inactiveQueue.Valid())
inactiveQueue.Close() inactiveQueue.Close()
newProposalMsg, err := simappcodec.NewMsgSubmitProposal( newProposalMsg, err := codecstd.NewMsgSubmitProposal(
gov.ContentFromProposalType("test", "test", gov.ProposalTypeText), gov.ContentFromProposalType("test", "test", gov.ProposalTypeText),
sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
addrs[0], addrs[0],
@ -80,7 +80,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) {
require.False(t, inactiveQueue.Valid()) require.False(t, inactiveQueue.Valid())
inactiveQueue.Close() inactiveQueue.Close()
newProposalMsg, err := simappcodec.NewMsgSubmitProposal( newProposalMsg, err := codecstd.NewMsgSubmitProposal(
gov.ContentFromProposalType("test", "test", gov.ProposalTypeText), gov.ContentFromProposalType("test", "test", gov.ProposalTypeText),
sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
addrs[0], addrs[0],
@ -103,7 +103,7 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) {
require.False(t, inactiveQueue.Valid()) require.False(t, inactiveQueue.Valid())
inactiveQueue.Close() inactiveQueue.Close()
newProposalMsg2, err := simappcodec.NewMsgSubmitProposal( newProposalMsg2, err := codecstd.NewMsgSubmitProposal(
gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText), gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText),
sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
addrs[0], addrs[0],
@ -160,7 +160,7 @@ func TestTickPassedDepositPeriod(t *testing.T) {
require.False(t, activeQueue.Valid()) require.False(t, activeQueue.Valid())
activeQueue.Close() activeQueue.Close()
newProposalMsg, err := simappcodec.NewMsgSubmitProposal( newProposalMsg, err := codecstd.NewMsgSubmitProposal(
gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText), gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText),
sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
addrs[0], addrs[0],
@ -216,7 +216,7 @@ func TestTickPassedVotingPeriod(t *testing.T) {
activeQueue.Close() activeQueue.Close()
proposalCoins := sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(5))} proposalCoins := sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(5))}
newProposalMsg, err := simappcodec.NewMsgSubmitProposal(TestProposal, proposalCoins, addrs[0]) newProposalMsg, err := codecstd.NewMsgSubmitProposal(TestProposal, proposalCoins, addrs[0])
require.NoError(t, err) require.NoError(t, err)
res, err := govHandler(ctx, newProposalMsg) res, err := govHandler(ctx, newProposalMsg)

4
x/gov/keeper/common_test.go
View File

@ -1,8 +1,8 @@
package keeper_test package keeper_test
import ( import (
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/gov/types"
"github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/staking"
@ -17,7 +17,7 @@ func createValidators(ctx sdk.Context, app *simapp.SimApp, powers []int64) ([]sd
valAddrs := simapp.ConvertAddrsToValAddrs(addrs) valAddrs := simapp.ConvertAddrsToValAddrs(addrs)
pks := simapp.CreateTestPubKeys(5) pks := simapp.CreateTestPubKeys(5)
appCodec := simappcodec.NewAppCodec(app.Codec()) appCodec := codecstd.NewAppCodec(app.Codec())
app.StakingKeeper = staking.NewKeeper( app.StakingKeeper = staking.NewKeeper(
appCodec, appCodec,
app.GetKey(staking.StoreKey), app.GetKey(staking.StoreKey),

6
x/gov/keeper/querier_test.go
View File

@ -10,8 +10,8 @@ import (
abci "github.com/tendermint/tendermint/abci/types" abci "github.com/tendermint/tendermint/abci/types"
"github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec"
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/gov/keeper" "github.com/cosmos/cosmos-sdk/x/gov/keeper"
"github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/cosmos/cosmos-sdk/x/gov/types"
@ -147,7 +147,7 @@ func getQueriedVotes(t *testing.T, ctx sdk.Context, cdc codec.JSONMarshaler, que
func TestQueries(t *testing.T) { func TestQueries(t *testing.T) {
app := simapp.Setup(false) app := simapp.Setup(false)
ctx := app.BaseApp.NewContext(false, abci.Header{}) ctx := app.BaseApp.NewContext(false, abci.Header{})
appCodec := simappcodec.NewAppCodec(app.Codec()) appCodec := codecstd.NewAppCodec(app.Codec())
querier := keeper.NewQuerier(app.GovKeeper) querier := keeper.NewQuerier(app.GovKeeper)
@ -295,7 +295,7 @@ func TestQueries(t *testing.T) {
func TestPaginatedVotesQuery(t *testing.T) { func TestPaginatedVotesQuery(t *testing.T) {
app := simapp.Setup(false) app := simapp.Setup(false)
ctx := app.BaseApp.NewContext(false, abci.Header{}) ctx := app.BaseApp.NewContext(false, abci.Header{})
appCodec := simappcodec.NewAppCodec(app.Codec()) appCodec := codecstd.NewAppCodec(app.Codec())
proposal := types.Proposal{ proposal := types.Proposal{
ProposalBase: types.ProposalBase{ ProposalBase: types.ProposalBase{

4
x/staking/common_test.go
View File

@ -6,8 +6,8 @@ import (
"github.com/tendermint/tendermint/crypto/secp256k1" "github.com/tendermint/tendermint/crypto/secp256k1"
"github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec"
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
cdc "github.com/cosmos/cosmos-sdk/simapp/codec"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/staking"
"github.com/cosmos/cosmos-sdk/x/staking/keeper" "github.com/cosmos/cosmos-sdk/x/staking/keeper"
@ -43,7 +43,7 @@ func getBaseSimappWithCustomKeeper() (*codec.Codec, *simapp.SimApp, sdk.Context)
app := simapp.Setup(false) app := simapp.Setup(false)
ctx := app.BaseApp.NewContext(false, abci.Header{}) ctx := app.BaseApp.NewContext(false, abci.Header{})
appCodec := cdc.NewAppCodec(codec.New()) appCodec := codecstd.NewAppCodec(codec.New())
app.StakingKeeper = keeper.NewKeeper( app.StakingKeeper = keeper.NewKeeper(
appCodec, appCodec,

4
x/staking/keeper/common_test.go
View File

@ -6,8 +6,8 @@ import (
abci "github.com/tendermint/tendermint/abci/types" abci "github.com/tendermint/tendermint/abci/types"
"github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec"
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/staking"
"github.com/cosmos/cosmos-sdk/x/staking/keeper" "github.com/cosmos/cosmos-sdk/x/staking/keeper"
@ -24,7 +24,7 @@ func createTestInput() (*codec.Codec, *simapp.SimApp, sdk.Context) {
app := simapp.Setup(false) app := simapp.Setup(false)
ctx := app.BaseApp.NewContext(false, abci.Header{}) ctx := app.BaseApp.NewContext(false, abci.Header{})
appCodec := simappcodec.NewAppCodec(codec.New()) appCodec := codecstd.NewAppCodec(codec.New())
app.StakingKeeper = keeper.NewKeeper( app.StakingKeeper = keeper.NewKeeper(
appCodec, appCodec,

8
x/supply/keeper/bank_test.go
View File

@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
abci "github.com/tendermint/tendermint/abci/types" abci "github.com/tendermint/tendermint/abci/types"
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
keep "github.com/cosmos/cosmos-sdk/x/supply/keeper" keep "github.com/cosmos/cosmos-sdk/x/supply/keeper"
"github.com/cosmos/cosmos-sdk/x/supply/types" "github.com/cosmos/cosmos-sdk/x/supply/types"
@ -55,7 +55,7 @@ func TestSendCoins(t *testing.T) {
maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking} maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking}
maccPerms[randomPerm] = []string{"random"} maccPerms[randomPerm] = []string{"random"}
appCodec := simappcodec.NewAppCodec(app.Codec()) appCodec := codecstd.NewAppCodec(app.Codec())
keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms) keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms)
ak := app.AccountKeeper ak := app.AccountKeeper
@ -116,7 +116,7 @@ func TestMintCoins(t *testing.T) {
maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking} maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking}
maccPerms[randomPerm] = []string{"random"} maccPerms[randomPerm] = []string{"random"}
appCodec := simappcodec.NewAppCodec(app.Codec()) appCodec := codecstd.NewAppCodec(app.Codec())
keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms) keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms)
ak := app.AccountKeeper ak := app.AccountKeeper
@ -164,7 +164,7 @@ func TestBurnCoins(t *testing.T) {
maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking} maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking}
maccPerms[randomPerm] = []string{"random"} maccPerms[randomPerm] = []string{"random"}
appCodec := simappcodec.NewAppCodec(app.Codec()) appCodec := codecstd.NewAppCodec(app.Codec())
keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms) keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms)
ak := app.AccountKeeper ak := app.AccountKeeper

4
x/supply/keeper/keeper_test.go
View File

@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
abci "github.com/tendermint/tendermint/abci/types" abci "github.com/tendermint/tendermint/abci/types"
codecstd "github.com/cosmos/cosmos-sdk/codec/std"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
keep "github.com/cosmos/cosmos-sdk/x/supply/keeper" keep "github.com/cosmos/cosmos-sdk/x/supply/keeper"
"github.com/cosmos/cosmos-sdk/x/supply/types" "github.com/cosmos/cosmos-sdk/x/supply/types"
@ -39,7 +39,7 @@ func TestValidatePermissions(t *testing.T) {
maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking} maccPerms[multiPerm] = []string{types.Burner, types.Minter, types.Staking}
maccPerms[randomPerm] = []string{"random"} maccPerms[randomPerm] = []string{"random"}
appCodec := simappcodec.NewAppCodec(app.Codec()) appCodec := codecstd.NewAppCodec(app.Codec())
keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms) keeper := keep.NewKeeper(appCodec, app.GetKey(types.StoreKey), app.AccountKeeper, app.BankKeeper, maccPerms)
err := keeper.ValidatePermissions(multiPermAcc) err := keeper.ValidatePermissions(multiPermAcc)

2
x/upgrade/types/types.pb.go
View File

@ -117,7 +117,7 @@ func (m *SoftwareUpgradeProposal) XXX_DiscardUnknown() {
var xxx_messageInfo_SoftwareUpgradeProposal proto.InternalMessageInfo var xxx_messageInfo_SoftwareUpgradeProposal proto.InternalMessageInfo
// SoftwareUpgradeProposal is a gov Content type for cancelling a software upgrade // CancelSoftwareUpgradeProposal is a gov Content type for cancelling a software upgrade
type CancelSoftwareUpgradeProposal struct { type CancelSoftwareUpgradeProposal struct {
Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`
Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`