From 5f0c53da174c507baf668c695c5bc9a8a8c440c9 Mon Sep 17 00:00:00 2001 From: Aleksandr Bezobchuk Date: Mon, 2 Mar 2020 16:46:28 -0500 Subject: [PATCH] update tests --- simapp/codec/codec.pb.go | 139 +++++++++++++---------- simapp/codec/codec.proto | 2 + simapp/codec/msgs.go | 2 +- x/gov/keeper/keeper_test.go | 8 +- x/gov/keeper/proposal_test.go | 55 +-------- x/gov/types/genesis.go | 3 +- x/gov/types/types.pb.go | 202 +++++++++++++++++++++------------- x/gov/types/types.proto | 1 + 8 files changed, 223 insertions(+), 189 deletions(-) diff --git a/simapp/codec/codec.pb.go b/simapp/codec/codec.pb.go index 17b2525563..7ef14c9169 100644 --- a/simapp/codec/codec.pb.go +++ b/simapp/codec/codec.pb.go @@ -583,62 +583,62 @@ func init() { func init() { proto.RegisterFile("simapp/codec/codec.proto", fileDescriptor_3c6d4085e4065f5a) } var fileDescriptor_3c6d4085e4065f5a = []byte{ - // 876 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x41, 0x6f, 0xe3, 0x44, - 0x14, 0xb6, 0x77, 0xb3, 0x6d, 0x34, 0xbb, 0xc0, 0x32, 0x62, 0x69, 0x14, 0x50, 0xb2, 0x64, 0x61, - 0x05, 0x8b, 0x6a, 0xef, 0x52, 0xa0, 0x6d, 0x24, 0x54, 0x9a, 0x50, 0x14, 0x24, 0x8a, 0xaa, 0x14, - 0x38, 0x20, 0x90, 0xe5, 0x8c, 0x07, 0xc7, 0xaa, 0xed, 0x19, 0x3c, 0x63, 0xe3, 0xfc, 0x03, 0xc4, - 0xa9, 0x3f, 0xa1, 0xe2, 0xc0, 0x91, 0x53, 0x8f, 0xfc, 0x80, 0xaa, 0xa7, 0x1e, 0x39, 0x55, 0xa8, - 0xbd, 0xf0, 0x33, 0x90, 0x3d, 0x63, 0xc7, 0x96, 0x9d, 0x64, 0x2f, 0x56, 0x3c, 0xef, 0x7b, 0xdf, - 0xf7, 0x8d, 0x67, 0xde, 0x7b, 0x01, 0x2d, 0xe6, 0x78, 0x26, 0xa5, 0x3a, 0x22, 0x16, 0x46, 0xe2, - 0xa9, 0xd1, 0x80, 0x70, 0x02, 0xdb, 0x88, 0x30, 0x8f, 0x30, 0x83, 0x59, 0x27, 0x9a, 0x00, 0x69, - 0x22, 0x1c, 0xbd, 0x68, 0x7f, 0xc8, 0xa7, 0x4e, 0x60, 0x19, 0xd4, 0x0c, 0xf8, 0x4c, 0x4f, 0xe1, - 0xba, 0x40, 0x6f, 0x16, 0x5f, 0x04, 0x51, 0xfb, 0x69, 0x15, 0x6c, 0x13, 0x9b, 0xcc, 0x7f, 0x49, - 0x5c, 0x2b, 0xd6, 0xcd, 0x90, 0x4f, 0x75, 0x3e, 0xa3, 0x98, 0x89, 0xa7, 0x8c, 0x3c, 0x96, 0x91, - 0x08, 0x33, 0xee, 0xf8, 0x76, 0x0d, 0xa2, 0x1d, 0xeb, 0x2c, 0xa4, 0xd4, 0x9d, 0xd5, 0xc4, 0xde, - 0x8e, 0x75, 0x1c, 0x39, 0x16, 0xf6, 0x11, 0xae, 0x89, 0x6e, 0xc4, 0xba, 0x4d, 0xa2, 0x9a, 0xc0, - 0x93, 0x58, 0xa7, 0x66, 0x60, 0x7a, 0x72, 0x35, 0x71, 0x4e, 0x09, 0x33, 0xdd, 0x12, 0xe8, 0xad, - 0x58, 0x0f, 0xa9, 0x1d, 0x98, 0x16, 0xae, 0xb7, 0x6d, 0x39, 0x8c, 0x07, 0xce, 0x24, 0xe4, 0x0e, - 0xf1, 0xab, 0x88, 0xde, 0xdf, 0x0d, 0xb0, 0xbe, 0x8f, 0x10, 0x09, 0x7d, 0x0e, 0xbf, 0x04, 0x0f, - 0x26, 0x26, 0xc3, 0x86, 0x29, 0xde, 0x5b, 0xea, 0x63, 0xf5, 0xfd, 0xfb, 0x1f, 0xbd, 0xa3, 0x15, - 0x8e, 0x21, 0xd6, 0x92, 0xcf, 0xa0, 0x45, 0x2f, 0xb4, 0x81, 0xc9, 0xb0, 0x4c, 0x1c, 0x29, 0xe3, - 0xfb, 0x93, 0xf9, 0x2b, 0x8c, 0x40, 0x1b, 0x11, 0x9f, 0x3b, 0x7e, 0x48, 0x42, 0x66, 0xc8, 0x4f, - 0x96, 0xb3, 0xde, 0x49, 0x59, 0x3f, 0xad, 0x63, 0x15, 0xc8, 0x84, 0x7d, 0x98, 0xe7, 0x7f, 0x2f, - 0x16, 0xe7, 0x52, 0x2d, 0xb4, 0x20, 0x06, 0x3d, 0xb0, 0x61, 0x61, 0xd7, 0x9c, 0x61, 0xab, 0x22, - 0x7a, 0x37, 0x15, 0xdd, 0x5a, 0x2e, 0xfa, 0x85, 0x48, 0xae, 0x28, 0x3e, 0xb2, 0xea, 0x02, 0x90, - 0x82, 0x16, 0xc5, 0x81, 0x43, 0x2c, 0x07, 0x55, 0xf4, 0x1a, 0xa9, 0xde, 0xc7, 0xcb, 0xf5, 0x8e, - 0x64, 0x76, 0x45, 0xf0, 0x4d, 0x5a, 0x1b, 0x81, 0xdf, 0x80, 0x57, 0x3d, 0x62, 0x85, 0xee, 0xfc, - 0x88, 0xee, 0xa5, 0x3a, 0xef, 0x95, 0x75, 0xc4, 0x3d, 0x4c, 0x14, 0x0e, 0x53, 0xf4, 0x9c, 0xf8, - 0x15, 0xaf, 0xb8, 0xd0, 0xdf, 0xbd, 0x3c, 0xdf, 0xfc, 0xe4, 0x99, 0xed, 0xf0, 0x69, 0x38, 0xd1, - 0x10, 0xf1, 0x64, 0xd5, 0x64, 0x95, 0xc4, 0xac, 0x13, 0x5d, 0xde, 0x7b, 0x1c, 0x53, 0x12, 0x70, - 0x6c, 0x69, 0x32, 0x75, 0x70, 0x0f, 0xdc, 0x65, 0xa1, 0xd7, 0xfb, 0x5d, 0x05, 0x6b, 0xc7, 0xa9, - 0x1c, 0xdc, 0x01, 0x6b, 0x42, 0x58, 0xde, 0x9b, 0xce, 0x22, 0x53, 0x02, 0x3f, 0x52, 0xc6, 0x12, - 0xdf, 0xdf, 0xfb, 0xef, 0xac, 0xab, 0x5e, 0x9e, 0x6f, 0x6e, 0xaf, 0xb2, 0x22, 0x0b, 0x2c, 0x37, - 0x23, 0x98, 0xbe, 0xca, 0xcc, 0xfc, 0xa1, 0x82, 0xe6, 0x81, 0xac, 0x33, 0xf8, 0x35, 0x78, 0x80, - 0x7f, 0x09, 0x9d, 0x88, 0x20, 0x33, 0xb9, 0xfa, 0xd2, 0xd4, 0xd3, 0xb2, 0xa9, 0xac, 0x2a, 0x13, - 0x5b, 0x07, 0x05, 0xf4, 0x48, 0x19, 0x97, 0xb2, 0xfb, 0xfb, 0xd2, 0xe2, 0xee, 0x0a, 0x87, 0x79, - 0x99, 0xe7, 0x1e, 0x33, 0x43, 0x99, 0xc9, 0xbf, 0x54, 0xf0, 0xfa, 0x21, 0xb3, 0x8f, 0xc3, 0x89, - 0xe7, 0xf0, 0xdc, 0xed, 0xe7, 0xa0, 0x99, 0xa5, 0x4a, 0xa7, 0xef, 0x6a, 0x8b, 0xbb, 0x5f, 0x4e, - 0x3a, 0xce, 0xb3, 0xe0, 0x21, 0x68, 0x24, 0x35, 0x28, 0xcb, 0x4b, 0x5f, 0xbc, 0xcf, 0x8a, 0x78, - 0x52, 0xc9, 0x83, 0xe6, 0xc5, 0x75, 0x57, 0xb9, 0xba, 0xee, 0xaa, 0xe3, 0x94, 0xa6, 0xdf, 0xfc, - 0xed, 0xac, 0xab, 0x24, 0x9b, 0xee, 0xfd, 0x59, 0x34, 0x7c, 0x24, 0x5b, 0x10, 0xfc, 0x0c, 0xac, - 0x27, 0x75, 0x88, 0xf3, 0x36, 0xf1, 0x64, 0x99, 0xdf, 0xa1, 0x80, 0x8e, 0xb3, 0x1c, 0x38, 0x2a, - 0xb9, 0x7d, 0x56, 0x76, 0x6b, 0x93, 0xa8, 0x64, 0x34, 0x13, 0x5d, 0x61, 0xf4, 0x54, 0x05, 0xcd, - 0xdc, 0xdf, 0x9e, 0x14, 0xa8, 0xed, 0x61, 0x52, 0x60, 0x19, 0x2f, 0x1c, 0xce, 0x37, 0x78, 0xe7, - 0xa5, 0x37, 0x38, 0x68, 0x24, 0x2c, 0xf9, 0x36, 0x7b, 0x67, 0x0d, 0xb0, 0x2e, 0x43, 0x70, 0x1b, - 0x34, 0x38, 0x8e, 0xf9, 0x52, 0x47, 0xdf, 0xe2, 0x38, 0xdf, 0xed, 0x48, 0x19, 0xa7, 0x09, 0xf0, - 0x47, 0xf0, 0x30, 0x1d, 0x03, 0x98, 0xe3, 0xc0, 0x40, 0x53, 0xd3, 0xb7, 0x17, 0x9c, 0xb2, 0x18, - 0x16, 0xe9, 0xce, 0x32, 0xfc, 0x30, 0x85, 0x17, 0x28, 0x5f, 0xa3, 0xe5, 0x10, 0xfc, 0x09, 0x3c, - 0x64, 0xe4, 0x67, 0xfe, 0xab, 0x19, 0x60, 0x43, 0x0e, 0x12, 0xd9, 0x2d, 0x9f, 0x97, 0xd9, 0x65, - 0x30, 0xad, 0x60, 0x99, 0xf0, 0x9d, 0x58, 0x2a, 0xd2, 0xb3, 0x72, 0x08, 0x52, 0xb0, 0x81, 0x4c, - 0x1f, 0x61, 0xd7, 0xa8, 0xa8, 0x34, 0xea, 0x06, 0x41, 0x41, 0x65, 0x98, 0xe6, 0x2d, 0xd6, 0x7a, - 0x84, 0xea, 0x00, 0xd0, 0x05, 0x6f, 0x20, 0xe2, 0x79, 0xa1, 0xef, 0xf0, 0x99, 0x41, 0x09, 0x71, - 0x0d, 0x46, 0xb1, 0x6f, 0xc9, 0x56, 0xb9, 0x53, 0x96, 0x2b, 0x4e, 0x47, 0x71, 0x8e, 0x32, 0xf3, - 0x88, 0x10, 0xf7, 0x38, 0xc9, 0x2b, 0x08, 0x42, 0x54, 0x89, 0xf6, 0x77, 0x64, 0x63, 0x78, 0xbe, - 0xa2, 0x31, 0xe4, 0x13, 0x3e, 0xbf, 0x2a, 0xa2, 0x1f, 0x0c, 0x86, 0x17, 0x37, 0x1d, 0xf5, 0xea, - 0xa6, 0xa3, 0xfe, 0x7b, 0xd3, 0x51, 0x4f, 0x6f, 0x3b, 0xca, 0xd5, 0x6d, 0x47, 0xf9, 0xe7, 0xb6, - 0xa3, 0xfc, 0xf0, 0xc1, 0x52, 0xca, 0xe2, 0xbf, 0xa6, 0xc9, 0x5a, 0x3a, 0xcc, 0xb7, 0xfe, 0x0f, - 0x00, 0x00, 0xff, 0xff, 0x22, 0x64, 0xee, 0x71, 0x4c, 0x09, 0x00, 0x00, + // 880 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x41, 0x8f, 0xdb, 0x44, + 0x14, 0xb6, 0x5b, 0x77, 0x37, 0x9a, 0x16, 0x28, 0x23, 0xca, 0x46, 0x01, 0x25, 0x65, 0x0b, 0x15, + 0x14, 0xad, 0xdd, 0x52, 0xa0, 0xdb, 0x48, 0xa8, 0x34, 0xa1, 0x28, 0x48, 0x2c, 0x5a, 0x65, 0x81, + 0x03, 0x02, 0x59, 0xce, 0x78, 0x70, 0xac, 0xda, 0x9e, 0xc1, 0x33, 0x36, 0xce, 0x3f, 0x40, 0x9c, + 0x38, 0x71, 0x5e, 0x71, 0xe0, 0xc8, 0xa9, 0x47, 0x7e, 0x40, 0xb5, 0xa7, 0x3d, 0x72, 0x5a, 0xa1, + 0xdd, 0x0b, 0x3f, 0x03, 0x79, 0x66, 0xec, 0xd8, 0xb2, 0x93, 0xf4, 0x62, 0xc5, 0xf3, 0xbe, 0xf7, + 0x7d, 0xdf, 0x78, 0xe6, 0xbd, 0x17, 0xd0, 0x65, 0x7e, 0xe8, 0x50, 0x6a, 0x21, 0xe2, 0x62, 0x24, + 0x9f, 0x26, 0x8d, 0x09, 0x27, 0xb0, 0x87, 0x08, 0x0b, 0x09, 0xb3, 0x99, 0xfb, 0xd4, 0x94, 0x20, + 0x53, 0x86, 0xd3, 0x7b, 0xbd, 0xf7, 0xf9, 0xdc, 0x8f, 0x5d, 0x9b, 0x3a, 0x31, 0x5f, 0x58, 0x02, + 0x6e, 0x49, 0xf4, 0x5e, 0xf5, 0x45, 0x12, 0xf5, 0x6e, 0x37, 0xc1, 0x1e, 0xf1, 0xc8, 0xf2, 0x97, + 0xc2, 0x75, 0x33, 0xcb, 0x49, 0xf8, 0xdc, 0xe2, 0x0b, 0x8a, 0x99, 0x7c, 0xaa, 0xc8, 0x4d, 0x15, + 0x49, 0x31, 0xe3, 0x7e, 0xe4, 0xb5, 0x20, 0x7a, 0x99, 0xc5, 0x12, 0x4a, 0x83, 0x45, 0x4b, 0xec, + 0xcd, 0xcc, 0xc2, 0xa9, 0xef, 0xe2, 0x08, 0xe1, 0x96, 0xe8, 0x4e, 0x66, 0x79, 0x24, 0x6d, 0x09, + 0xdc, 0xca, 0x2c, 0xea, 0xc4, 0x4e, 0xa8, 0x56, 0x73, 0xe7, 0x94, 0x30, 0x27, 0xa8, 0x81, 0xde, + 0xc8, 0xac, 0x84, 0x7a, 0xb1, 0xe3, 0xe2, 0x76, 0xdb, 0xae, 0xcf, 0x78, 0xec, 0xcf, 0x12, 0xee, + 0x93, 0xa8, 0x89, 0xd8, 0xfd, 0xdb, 0x00, 0xdb, 0x8f, 0x11, 0x22, 0x49, 0xc4, 0xe1, 0xe7, 0xe0, + 0xda, 0xcc, 0x61, 0xd8, 0x76, 0xe4, 0x7b, 0x57, 0xbf, 0xa9, 0xbf, 0x7b, 0xf5, 0x83, 0xb7, 0xcc, + 0xca, 0x31, 0x64, 0x66, 0xfe, 0x19, 0xcc, 0xf4, 0x9e, 0x39, 0x72, 0x18, 0x56, 0x89, 0x13, 0x6d, + 0x7a, 0x75, 0xb6, 0x7c, 0x85, 0x29, 0xe8, 0x21, 0x12, 0x71, 0x3f, 0x4a, 0x48, 0xc2, 0x6c, 0xf5, + 0xc9, 0x4a, 0xd6, 0x4b, 0x82, 0xf5, 0xe3, 0x36, 0x56, 0x89, 0xcc, 0xd9, 0xc7, 0x65, 0xfe, 0xb7, + 0x72, 0x71, 0x29, 0xd5, 0x45, 0x2b, 0x62, 0x30, 0x04, 0x3b, 0x2e, 0x0e, 0x9c, 0x05, 0x76, 0x1b, + 0xa2, 0x97, 0x85, 0xe8, 0xfd, 0xf5, 0xa2, 0x9f, 0xc9, 0xe4, 0x86, 0xe2, 0x0d, 0xb7, 0x2d, 0x00, + 0x29, 0xe8, 0x52, 0x1c, 0xfb, 0xc4, 0xf5, 0x51, 0x43, 0xcf, 0x10, 0x7a, 0x1f, 0xae, 0xd7, 0x3b, + 0x54, 0xd9, 0x0d, 0xc1, 0xd7, 0x69, 0x6b, 0x04, 0x7e, 0x05, 0x5e, 0x0e, 0x89, 0x9b, 0x04, 0xcb, + 0x23, 0xba, 0x22, 0x74, 0xde, 0xa9, 0xeb, 0xc8, 0x7b, 0x98, 0x2b, 0x1c, 0x08, 0xf4, 0x92, 0xf8, + 0xa5, 0xb0, 0xba, 0x30, 0x7c, 0x78, 0xf2, 0x6c, 0xef, 0xa3, 0x3b, 0x9e, 0xcf, 0xe7, 0xc9, 0xcc, + 0x44, 0x24, 0x54, 0x55, 0x53, 0x54, 0x12, 0x73, 0x9f, 0x5a, 0xea, 0xde, 0xe3, 0x8c, 0x92, 0x98, + 0x63, 0xd7, 0x54, 0xa9, 0xa3, 0x2b, 0xe0, 0x32, 0x4b, 0xc2, 0xdd, 0x5f, 0x75, 0xb0, 0x75, 0x24, + 0xe4, 0xe0, 0x3e, 0xd8, 0x92, 0xc2, 0xea, 0xde, 0xf4, 0x57, 0x99, 0x92, 0xf8, 0x89, 0x36, 0x55, + 0xf8, 0xe1, 0xa3, 0xff, 0x8e, 0x07, 0xfa, 0xc9, 0xb3, 0xbd, 0x07, 0x9b, 0xac, 0xa8, 0x02, 0x2b, + 0xcd, 0x48, 0xa6, 0x2f, 0x0a, 0x33, 0x7f, 0xe8, 0xa0, 0xf3, 0x44, 0xd5, 0x19, 0xfc, 0x12, 0x5c, + 0xc3, 0x3f, 0x25, 0x7e, 0x4a, 0x90, 0x93, 0x5f, 0x7d, 0x65, 0xea, 0x76, 0xdd, 0x54, 0x51, 0x95, + 0xb9, 0xad, 0x27, 0x15, 0xf4, 0x44, 0x9b, 0xd6, 0xb2, 0x87, 0x8f, 0x95, 0xc5, 0x87, 0x1b, 0x1c, + 0x96, 0x65, 0x5e, 0x7a, 0x2c, 0x0c, 0x15, 0x26, 0xff, 0xd2, 0xc1, 0xab, 0x07, 0xcc, 0x3b, 0x4a, + 0x66, 0xa1, 0xcf, 0x4b, 0xb7, 0x9f, 0x82, 0x4e, 0x91, 0xaa, 0x9c, 0xbe, 0x6d, 0xae, 0xee, 0x7e, + 0x25, 0xe9, 0xb4, 0xcc, 0x82, 0x07, 0xc0, 0xc8, 0x6b, 0x50, 0x95, 0x97, 0xb5, 0x7a, 0x9f, 0x0d, + 0xf1, 0xbc, 0x92, 0x47, 0x9d, 0xe7, 0x67, 0x03, 0xed, 0xf4, 0x6c, 0xa0, 0x4f, 0x05, 0xcd, 0xb0, + 0xf3, 0xcb, 0xf1, 0x40, 0xcb, 0x37, 0xbd, 0xfb, 0x67, 0xd5, 0xf0, 0xa1, 0x6a, 0x41, 0xf0, 0x13, + 0xb0, 0x9d, 0xd7, 0x21, 0x2e, 0xdb, 0xc4, 0xad, 0x75, 0x7e, 0xc7, 0x12, 0x3a, 0x2d, 0x72, 0xe0, + 0xa4, 0xe6, 0xf6, 0x4e, 0xdd, 0xad, 0x47, 0xd2, 0x9a, 0xd1, 0x42, 0x74, 0x83, 0xd1, 0xdf, 0x75, + 0xd0, 0x29, 0xfd, 0x3d, 0x52, 0x02, 0xad, 0x3d, 0x4c, 0x09, 0xac, 0xe3, 0x85, 0xe3, 0xe5, 0x06, + 0x2f, 0xbd, 0xf0, 0x06, 0x47, 0x46, 0xce, 0x52, 0x6e, 0x73, 0x68, 0x08, 0x63, 0xc7, 0x06, 0xd8, + 0x56, 0x00, 0xf8, 0x00, 0x18, 0x1c, 0x67, 0x7c, 0xad, 0xaf, 0xaf, 0x71, 0x56, 0xee, 0x79, 0xa2, + 0x4d, 0x45, 0x02, 0xfc, 0x1e, 0x5c, 0x17, 0xc3, 0x00, 0x73, 0x1c, 0xdb, 0x68, 0xee, 0x44, 0xde, + 0x8a, 0xb3, 0x96, 0x23, 0x43, 0xec, 0xaf, 0xc0, 0x8f, 0x05, 0xbc, 0x42, 0xf9, 0x0a, 0xad, 0x87, + 0xe0, 0x0f, 0xe0, 0x3a, 0x23, 0x3f, 0xf2, 0x9f, 0x9d, 0x18, 0xdb, 0x6a, 0x9c, 0xa8, 0x9e, 0x79, + 0xb7, 0xce, 0xae, 0x82, 0xa2, 0x8e, 0x55, 0xc2, 0x37, 0x72, 0xa9, 0x4a, 0xcf, 0xea, 0x21, 0x48, + 0xc1, 0x0e, 0x72, 0x22, 0x84, 0x03, 0xbb, 0xa1, 0x62, 0xb4, 0x8d, 0x83, 0x8a, 0xca, 0x58, 0xe4, + 0xad, 0xd6, 0xba, 0x81, 0xda, 0x00, 0x30, 0x00, 0xaf, 0x21, 0x12, 0x86, 0x49, 0xe4, 0xf3, 0x85, + 0x4d, 0x09, 0x09, 0x6c, 0x46, 0x71, 0xe4, 0xaa, 0x86, 0xb9, 0x5f, 0x97, 0xab, 0xce, 0x48, 0x79, + 0x9a, 0x2a, 0xf3, 0x90, 0x90, 0xe0, 0x28, 0xcf, 0xab, 0x08, 0x42, 0xd4, 0x88, 0x0e, 0xf7, 0x55, + 0x7b, 0xb8, 0xbb, 0xa1, 0x3d, 0x94, 0x73, 0xbe, 0xbc, 0x30, 0xb2, 0x2b, 0x8c, 0xc6, 0xcf, 0xcf, + 0xfb, 0xfa, 0xe9, 0x79, 0x5f, 0xff, 0xf7, 0xbc, 0xaf, 0xff, 0x76, 0xd1, 0xd7, 0x4e, 0x2f, 0xfa, + 0xda, 0x3f, 0x17, 0x7d, 0xed, 0xbb, 0xf7, 0xd6, 0x52, 0x56, 0xff, 0x3b, 0xcd, 0xb6, 0xc4, 0x48, + 0xbf, 0xff, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x44, 0x7b, 0x22, 0xdc, 0x52, 0x09, 0x00, 0x00, } func (this *Supply) Equal(that interface{}) bool { @@ -803,6 +803,33 @@ func (this *MsgSubmitProposal) Equal(that interface{}) bool { } return true } +func (this *Proposal) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*Proposal) + if !ok { + that2, ok := that.(Proposal) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if !this.ProposalBase.Equal(&that1.ProposalBase) { + return false + } + if !this.Content.Equal(&that1.Content) { + return false + } + return true +} func (this *Content) Equal(that interface{}) bool { if that == nil { return this == nil diff --git a/simapp/codec/codec.proto b/simapp/codec/codec.proto index 9b5d94991e..c59061ab71 100644 --- a/simapp/codec/codec.proto +++ b/simapp/codec/codec.proto @@ -74,6 +74,8 @@ message MsgSubmitProposal { // Proposal defines the application-level concrete proposal type used in governance // proposals. message Proposal { + option (gogoproto.equal) = true; + cosmos_sdk.x.gov.v1.ProposalBase base = 1 [(gogoproto.embed) = true, (gogoproto.nullable) = false]; Content content = 2 [(gogoproto.nullable) = false]; } diff --git a/simapp/codec/msgs.go b/simapp/codec/msgs.go index d34a07becb..5c4599d8d5 100644 --- a/simapp/codec/msgs.go +++ b/simapp/codec/msgs.go @@ -10,7 +10,7 @@ import ( var ( _ eviexported.MsgSubmitEvidence = MsgSubmitEvidence{} - _ gov.MsgSubmitProposal = MsgSubmitProposal{} + _ gov.MsgSubmitProposalI = MsgSubmitProposal{} ) // NewMsgSubmitEvidence returns a new MsgSubmitEvidence. diff --git a/x/gov/keeper/keeper_test.go b/x/gov/keeper/keeper_test.go index ec1a696791..7bf2899c3d 100644 --- a/x/gov/keeper/keeper_test.go +++ b/x/gov/keeper/keeper_test.go @@ -3,12 +3,10 @@ package keeper_test import ( "testing" - proto "github.com/gogo/protobuf/types" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" "github.com/cosmos/cosmos-sdk/simapp" - simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec" "github.com/cosmos/cosmos-sdk/x/gov/types" ) @@ -31,7 +29,6 @@ func TestIncrementProposalNumber(t *testing.T) { func TestProposalQueues(t *testing.T) { app := simapp.Setup(false) ctx := app.BaseApp.NewContext(false, abci.Header{}) - appCodec := simappcodec.NewAppCodec(app.Codec()) // create test proposals tp := TestProposal @@ -53,9 +50,8 @@ func TestProposalQueues(t *testing.T) { activeIterator := app.GovKeeper.ActiveProposalQueueIterator(ctx, proposal.VotingEndTime) require.True(t, activeIterator.Valid()) - var propIDValue proto.UInt64Value - appCodec.UnmarshalBinaryLengthPrefixed(activeIterator.Value(), &propIDValue) + proposalID, _ = types.SplitActiveProposalQueueKey(activeIterator.Key()) + require.Equal(t, proposalID, proposal.ProposalID) - require.Equal(t, propIDValue.Value, proposal.ProposalID) activeIterator.Close() } diff --git a/x/gov/keeper/proposal_test.go b/x/gov/keeper/proposal_test.go index 54ef390c84..99169d1769 100644 --- a/x/gov/keeper/proposal_test.go +++ b/x/gov/keeper/proposal_test.go @@ -54,51 +54,10 @@ func TestActivateVotingPeriod(t *testing.T) { activeIterator.Close() } -type validProposal struct{} - -func (validProposal) GetTitle() string { return "title" } -func (validProposal) GetDescription() string { return "description" } -func (validProposal) ProposalRoute() string { return types.RouterKey } -func (validProposal) ProposalType() string { return types.ProposalTypeText } -func (validProposal) String() string { return "" } -func (validProposal) ValidateBasic() error { return nil } - -type invalidProposalTitle1 struct{ validProposal } - -func (invalidProposalTitle1) GetTitle() string { return "" } - -type invalidProposalTitle2 struct{ validProposal } - -func (invalidProposalTitle2) GetTitle() string { return strings.Repeat("1234567890", 100) } - -type invalidProposalDesc1 struct{ validProposal } - -func (invalidProposalDesc1) GetDescription() string { return "" } - -type invalidProposalDesc2 struct{ validProposal } - -func (invalidProposalDesc2) GetDescription() string { return strings.Repeat("1234567890", 1000) } - -type invalidProposalRoute struct{ validProposal } +type invalidProposalRoute struct{ types.TextProposal } func (invalidProposalRoute) ProposalRoute() string { return "nonexistingroute" } -type invalidProposalValidation struct{ validProposal } - -func (invalidProposalValidation) ValidateBasic() error { - return errors.New("invalid proposal") -} - -// func registerTestCodec(cdc *codec.Codec) { -// cdc.RegisterConcrete(validProposal{}, "test/validproposal", nil) -// cdc.RegisterConcrete(invalidProposalTitle1{}, "test/invalidproposalt1", nil) -// cdc.RegisterConcrete(invalidProposalTitle2{}, "test/invalidproposalt2", nil) -// cdc.RegisterConcrete(invalidProposalDesc1{}, "test/invalidproposald1", nil) -// cdc.RegisterConcrete(invalidProposalDesc2{}, "test/invalidproposald2", nil) -// cdc.RegisterConcrete(invalidProposalRoute{}, "test/invalidproposalr", nil) -// cdc.RegisterConcrete(invalidProposalValidation{}, "test/invalidproposalv", nil) -// } - func TestSubmitProposal(t *testing.T) { app := simapp.Setup(false) ctx := app.BaseApp.NewContext(false, abci.Header{}) @@ -107,16 +66,14 @@ func TestSubmitProposal(t *testing.T) { content types.Content expectedErr error }{ - {validProposal{}, nil}, + {types.TextProposal{Title: "title", Description: "description"}, nil}, // Keeper does not check the validity of title and description, no error - {invalidProposalTitle1{}, nil}, - {invalidProposalTitle2{}, nil}, - {invalidProposalDesc1{}, nil}, - {invalidProposalDesc2{}, nil}, + {types.TextProposal{Title: "", Description: "description"}, nil}, + {types.TextProposal{Title: strings.Repeat("1234567890", 100), Description: "description"}, nil}, + {types.TextProposal{Title: "title", Description: ""}, nil}, + {types.TextProposal{Title: "title", Description: strings.Repeat("1234567890", 1000)}, nil}, // error only when invalid route {invalidProposalRoute{}, types.ErrNoProposalHandlerExists}, - // Keeper does not call ValidateBasic, msg.ValidateBasic does - {invalidProposalValidation{}, nil}, } for i, tc := range testCases { diff --git a/x/gov/types/genesis.go b/x/gov/types/genesis.go index e38b0213ee..7099cb9590 100644 --- a/x/gov/types/genesis.go +++ b/x/gov/types/genesis.go @@ -38,7 +38,8 @@ func DefaultGenesisState() GenesisState { } func (data GenesisState) Equal(other GenesisState) bool { - return data.Deposits.Equal(other.Deposits) && + return data.StartingProposalID == other.StartingProposalID && + data.Deposits.Equal(other.Deposits) && data.Votes.Equal(other.Votes) && data.Proposals.Equal(other.Proposals) && data.DepositParams.Equal(other.DepositParams) && diff --git a/x/gov/types/types.pb.go b/x/gov/types/types.pb.go index 607ac5e8eb..f97a1c0dd5 100644 --- a/x/gov/types/types.pb.go +++ b/x/gov/types/types.pb.go @@ -439,82 +439,82 @@ func init() { func init() { proto.RegisterFile("x/gov/types/types.proto", fileDescriptor_a5ae5e91b5b3fb03) } var fileDescriptor_a5ae5e91b5b3fb03 = []byte{ - // 1185 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xc1, 0x6b, 0xdb, 0x56, - 0x18, 0x97, 0x6c, 0xc7, 0x49, 0x9e, 0x1d, 0x57, 0x7d, 0xc9, 0x5a, 0x4f, 0x0c, 0x49, 0x75, 0x4b, - 0xc9, 0x3a, 0x2a, 0xaf, 0xe9, 0x61, 0xd0, 0xc3, 0x98, 0x55, 0xab, 0xad, 0x4b, 0x63, 0x1b, 0xd9, - 0xa4, 0x74, 0x63, 0x08, 0xc5, 0x52, 0x15, 0xad, 0xb2, 0x9e, 0xe7, 0xf7, 0xec, 0xd5, 0xb7, 0xb1, - 0xc3, 0x28, 0x3e, 0xf5, 0xd8, 0x8b, 0xa1, 0xb0, 0x1e, 0xca, 0xd8, 0x61, 0x7f, 0x46, 0x60, 0x97, - 0x5e, 0x06, 0x65, 0x07, 0x77, 0x4d, 0x0e, 0x1b, 0x63, 0xa7, 0x5c, 0x06, 0x3b, 0x0d, 0xe9, 0x3d, - 0x25, 0x76, 0x92, 0x2e, 0x0d, 0xdd, 0x60, 0xec, 0x92, 0x44, 0xdf, 0xfb, 0x7d, 0xbf, 0xef, 0x7d, - 0xbf, 0xf7, 0xbd, 0xdf, 0x23, 0xe0, 0xf4, 0xfd, 0xa2, 0x8b, 0xfa, 0x45, 0x32, 0xe8, 0x38, 0x98, - 0xfe, 0x54, 0x3b, 0x5d, 0x44, 0x10, 0x5c, 0x6c, 0x21, 0xdc, 0x46, 0xd8, 0xc4, 0xf6, 0x3d, 0xf5, - 0xbe, 0xea, 0xa2, 0xbe, 0xda, 0xbf, 0x24, 0x9e, 0x3c, 0x80, 0x13, 0xcf, 0x93, 0x0d, 0xaf, 0x6b, - 0x9b, 0x1d, 0xab, 0x4b, 0x06, 0xc5, 0x28, 0x54, 0x74, 0x91, 0x8b, 0xf6, 0xfe, 0x62, 0x38, 0xd9, - 0x45, 0xc8, 0xf5, 0x1d, 0x0a, 0x59, 0xef, 0xdd, 0x2d, 0x12, 0xaf, 0xed, 0x60, 0x62, 0xb5, 0x3b, - 0x14, 0x50, 0xf8, 0x83, 0x07, 0x6f, 0xad, 0x62, 0xb7, 0xd1, 0x5b, 0x6f, 0x7b, 0xa4, 0xde, 0x45, - 0x1d, 0x84, 0x2d, 0x5f, 0xb3, 0xb0, 0x03, 0x1f, 0xf0, 0xe0, 0x84, 0x17, 0x78, 0xc4, 0xb3, 0x7c, - 0xd3, 0x76, 0x3a, 0x08, 0x7b, 0x24, 0xcf, 0x2b, 0xc9, 0xe5, 0xcc, 0xca, 0xa2, 0x3a, 0xb1, 0xcb, - 0xfe, 0x25, 0xf5, 0x2a, 0xf2, 0x02, 0xed, 0xe6, 0xe6, 0x58, 0xe6, 0x76, 0xc6, 0xf2, 0xa9, 0x81, - 0xd5, 0xf6, 0xaf, 0x14, 0xf6, 0x65, 0x16, 0xbe, 0x7d, 0x21, 0x2f, 0xbb, 0x1e, 0xd9, 0xe8, 0xad, - 0xab, 0x2d, 0xd4, 0x2e, 0x52, 0x02, 0xf6, 0xeb, 0x22, 0xb6, 0xef, 0xb1, 0xee, 0x42, 0x2a, 0x6c, - 0xe4, 0x58, 0x76, 0x99, 0x26, 0xc3, 0x55, 0x30, 0xd7, 0x89, 0xb6, 0xe6, 0x74, 0xf3, 0x09, 0x85, - 0x5f, 0xce, 0x6a, 0x97, 0xfe, 0x1c, 0xcb, 0x17, 0x5f, 0x83, 0xaf, 0xd4, 0x6a, 0x95, 0x6c, 0xbb, - 0xeb, 0x60, 0x6c, 0xec, 0x52, 0x5c, 0x49, 0xfd, 0xfa, 0x58, 0xe6, 0x0b, 0xbf, 0xf0, 0x60, 0x76, - 0x15, 0xbb, 0x6b, 0x88, 0x38, 0xb0, 0x09, 0x32, 0x1d, 0xd6, 0xbb, 0xe9, 0xd9, 0x79, 0x5e, 0xe1, - 0x97, 0x53, 0xda, 0xe5, 0xad, 0xb1, 0x0c, 0x62, 0x49, 0x2a, 0xe5, 0xdf, 0xc6, 0xf2, 0x24, 0x68, - 0x67, 0x2c, 0x43, 0xda, 0xea, 0x44, 0xb0, 0x60, 0x80, 0xf8, 0xab, 0x62, 0xc3, 0xeb, 0x60, 0xa6, - 0x8f, 0xc8, 0x9b, 0xec, 0x99, 0xe6, 0xc3, 0x0f, 0x40, 0x1a, 0x75, 0x88, 0x87, 0x82, 0x7c, 0x52, - 0xe1, 0x97, 0x73, 0x2b, 0xb2, 0x7a, 0xc8, 0x98, 0xa8, 0x61, 0x27, 0xb5, 0x08, 0x66, 0x30, 0x38, - 0xeb, 0xf4, 0x51, 0x02, 0x80, 0x55, 0xec, 0xc6, 0x6a, 0xfe, 0x3b, 0xcd, 0xd6, 0xc0, 0x3c, 0x3b, - 0x6b, 0xf4, 0x06, 0x0d, 0xef, 0x71, 0xc0, 0x4f, 0x41, 0xda, 0x6a, 0xa3, 0x5e, 0x40, 0xf2, 0xc9, - 0x57, 0x4f, 0xdd, 0xfb, 0xe1, 0xd4, 0x1d, 0x6b, 0xb6, 0x18, 0x29, 0x93, 0xe6, 0x16, 0xc8, 0x36, - 0x9d, 0xfb, 0xbb, 0x83, 0x0f, 0x97, 0xc0, 0x0c, 0xf1, 0x88, 0xef, 0x44, 0xaa, 0xcc, 0x1b, 0xf4, - 0x03, 0x2a, 0x20, 0x63, 0x3b, 0xb8, 0xd5, 0xf5, 0xe8, 0x21, 0x24, 0xa2, 0xb5, 0xc9, 0x10, 0x63, - 0xfb, 0x3a, 0x01, 0x66, 0x63, 0x95, 0xf5, 0xc3, 0x54, 0x3e, 0x37, 0xad, 0xf2, 0xff, 0x56, 0xd6, - 0x1f, 0xd2, 0x20, 0x3b, 0x65, 0x26, 0xda, 0x61, 0x6a, 0x9c, 0x39, 0x30, 0x73, 0x89, 0x68, 0xd4, - 0xe6, 0x99, 0x85, 0xec, 0x93, 0xe2, 0x36, 0x48, 0x63, 0x62, 0x91, 0x1e, 0x8e, 0x74, 0xc8, 0xad, - 0x9c, 0x3d, 0xf4, 0x16, 0xc4, 0x7c, 0x8d, 0x08, 0xaa, 0x89, 0x7b, 0x96, 0xb4, 0xbb, 0x01, 0xca, - 0x52, 0x30, 0x18, 0x1d, 0xfc, 0x1c, 0xc0, 0xbb, 0x5e, 0x60, 0xf9, 0x26, 0xb1, 0x7c, 0x7f, 0x60, - 0x76, 0x1d, 0xdc, 0xf3, 0x49, 0x74, 0xd5, 0x32, 0x2b, 0xca, 0xa1, 0x45, 0x9a, 0x21, 0xd0, 0x88, - 0x70, 0xda, 0x19, 0x66, 0x7c, 0x6f, 0xd3, 0x2a, 0x07, 0x99, 0x0a, 0x86, 0x10, 0x05, 0x27, 0x92, - 0xe0, 0x27, 0x20, 0x83, 0x23, 0xcb, 0x35, 0x43, 0x43, 0xce, 0xa7, 0xa2, 0x5a, 0xa2, 0x4a, 0xdd, - 0x5a, 0x8d, 0xdd, 0x5a, 0x6d, 0xc6, 0x6e, 0xad, 0x49, 0xac, 0x0a, 0x9b, 0x97, 0x89, 0xe4, 0xc2, - 0xc3, 0x17, 0x32, 0x6f, 0x00, 0x1a, 0x09, 0x13, 0xa0, 0x07, 0x04, 0x76, 0xde, 0xa6, 0x13, 0xd8, - 0xb4, 0xc2, 0xcc, 0x91, 0x15, 0xce, 0xb2, 0x0a, 0xa7, 0x69, 0x85, 0xfd, 0x0c, 0xb4, 0x4c, 0x8e, - 0x85, 0xf5, 0xc0, 0x8e, 0x4a, 0x7d, 0xc5, 0x83, 0x05, 0x82, 0xc8, 0xc4, 0x13, 0x91, 0x7e, 0xf5, - 0x54, 0xdd, 0x60, 0x15, 0x96, 0x68, 0x85, 0xa9, 0xbc, 0xe3, 0x3d, 0x10, 0xd9, 0x28, 0x37, 0xbe, - 0x6a, 0x3e, 0x38, 0xd9, 0x47, 0xc4, 0x0b, 0xdc, 0xf0, 0x64, 0xbb, 0x4c, 0xd2, 0xd9, 0x23, 0x1b, - 0x3e, 0xc7, 0xb6, 0x93, 0xa7, 0xdb, 0x39, 0x40, 0x41, 0x3b, 0x3e, 0x41, 0xe3, 0x8d, 0x30, 0x1c, - 0xb5, 0x7c, 0x17, 0xb0, 0xd0, 0x9e, 0xb8, 0x73, 0x47, 0xd6, 0x2a, 0x4c, 0xbf, 0x8e, 0xfb, 0x08, - 0x68, 0xa5, 0x05, 0x1a, 0x65, 0xd2, 0x5e, 0x99, 0x7b, 0xf4, 0x58, 0xe6, 0x9f, 0x86, 0xb7, 0x69, - 0x33, 0x01, 0x32, 0x93, 0xc3, 0xf3, 0x11, 0x48, 0x0e, 0x1c, 0x4c, 0x2d, 0x4a, 0x53, 0x43, 0xe6, - 0x9f, 0xc6, 0xf2, 0xf9, 0xd7, 0x10, 0xaf, 0x12, 0x10, 0x23, 0x4c, 0x85, 0x37, 0xc0, 0xac, 0xb5, - 0x8e, 0x89, 0xe5, 0x31, 0x33, 0x3b, 0x36, 0x4b, 0x9c, 0x0e, 0x3f, 0x04, 0x89, 0x00, 0x45, 0x77, - 0xe5, 0xf8, 0x24, 0x89, 0x00, 0x41, 0x17, 0x64, 0x03, 0x64, 0x7e, 0xe1, 0x91, 0x0d, 0xb3, 0xef, - 0x10, 0x14, 0xdd, 0x84, 0x79, 0x4d, 0x3f, 0x1e, 0xd3, 0xce, 0x58, 0x5e, 0xa4, 0xc2, 0x4e, 0x72, - 0x15, 0x0c, 0x10, 0xa0, 0xdb, 0x1e, 0xd9, 0x58, 0x73, 0x08, 0x62, 0xc6, 0xf4, 0x23, 0x0f, 0x52, - 0xd1, 0x8b, 0xff, 0x0f, 0xd9, 0xf3, 0x7f, 0xe4, 0x89, 0xbf, 0xf0, 0x1d, 0x0f, 0xc0, 0xde, 0x22, - 0x14, 0xc1, 0x8c, 0xbe, 0x5a, 0x6f, 0xde, 0x11, 0x38, 0xf1, 0xc4, 0x70, 0xa4, 0x64, 0x68, 0x58, - 0x6f, 0x77, 0xc8, 0x00, 0x9e, 0x02, 0xc9, 0x3b, 0x7a, 0x43, 0xe0, 0xc5, 0x85, 0xe1, 0x48, 0x99, - 0xa7, 0x2b, 0x77, 0x1c, 0x0c, 0x25, 0x30, 0x5b, 0xd2, 0x1a, 0xcd, 0x52, 0xa5, 0x2a, 0x24, 0xc4, - 0x93, 0xc3, 0x91, 0xb2, 0x40, 0xd7, 0x4a, 0xec, 0xa4, 0x97, 0x40, 0xa2, 0x5a, 0x13, 0x92, 0x62, - 0x76, 0x38, 0x52, 0xe6, 0xe8, 0x52, 0x15, 0xc1, 0xf3, 0x20, 0x5b, 0xad, 0x99, 0xb7, 0x2b, 0xcd, - 0x1b, 0xe6, 0x9a, 0xde, 0xac, 0x09, 0x29, 0x71, 0x69, 0x38, 0x52, 0x84, 0x78, 0x3d, 0x96, 0x5f, - 0xcc, 0x3e, 0xf8, 0x46, 0xe2, 0x9e, 0x3e, 0x91, 0xb8, 0xef, 0x9f, 0x48, 0xdc, 0x85, 0xdf, 0x79, - 0x90, 0x9b, 0x36, 0xea, 0x70, 0x5b, 0xd5, 0xca, 0x2d, 0x81, 0xa3, 0xdb, 0xa2, 0xc1, 0xaa, 0xe7, - 0xc3, 0xf7, 0x40, 0xae, 0xac, 0xd7, 0x6b, 0x8d, 0x4a, 0xd3, 0xac, 0xeb, 0x46, 0xa5, 0x56, 0x16, - 0x78, 0xf1, 0xf4, 0x70, 0xa4, 0x2c, 0x52, 0x08, 0xf3, 0x80, 0xba, 0xd3, 0xf5, 0x90, 0x0d, 0xdf, - 0x05, 0x0b, 0x6b, 0xb5, 0x66, 0xa5, 0x7a, 0x3d, 0xc6, 0x26, 0xc4, 0x53, 0xc3, 0x91, 0x02, 0x29, - 0x76, 0x2d, 0xba, 0x5f, 0x0c, 0xfa, 0x0e, 0x48, 0xd7, 0x4b, 0x8d, 0x86, 0x5e, 0x16, 0x92, 0xa2, - 0x30, 0x1c, 0x29, 0x59, 0x8a, 0xa9, 0x5b, 0x18, 0x3b, 0x36, 0x54, 0xc0, 0x9c, 0xa1, 0xdf, 0xd4, - 0xaf, 0x36, 0xf5, 0xb2, 0x90, 0x12, 0xe1, 0x70, 0xa4, 0xe4, 0xe8, 0xba, 0xe1, 0x7c, 0xe6, 0xb4, - 0x88, 0x13, 0xe5, 0x5f, 0x2b, 0x55, 0x6e, 0xe9, 0x65, 0x61, 0x66, 0x32, 0xff, 0x9a, 0xe5, 0xf9, - 0x8e, 0x3d, 0xdd, 0xae, 0x56, 0xdd, 0x7c, 0x29, 0x71, 0xcf, 0x5f, 0x4a, 0xdc, 0x97, 0x5b, 0x12, - 0xb7, 0xb9, 0x25, 0xf1, 0xcf, 0xb6, 0x24, 0xfe, 0xe7, 0x2d, 0x89, 0x7f, 0xb8, 0x2d, 0x71, 0xcf, - 0xb6, 0x25, 0xee, 0xf9, 0xb6, 0xc4, 0x7d, 0xfc, 0xf7, 0xf6, 0x37, 0xf1, 0x1f, 0xc3, 0x7a, 0x3a, - 0x72, 0x98, 0xcb, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x41, 0x42, 0x32, 0xc2, 0x47, 0x0c, 0x00, - 0x00, + // 1187 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0x31, 0x6f, 0xdb, 0x46, + 0x14, 0x26, 0x25, 0x59, 0xb6, 0x4f, 0xb2, 0xc2, 0x9c, 0xdd, 0x44, 0x25, 0x0a, 0x92, 0x51, 0x82, + 0xc0, 0x4d, 0x11, 0xaa, 0x71, 0x86, 0x02, 0x19, 0x8a, 0x8a, 0x11, 0x93, 0x28, 0x88, 0x25, 0x81, + 0x12, 0x1c, 0xb8, 0x45, 0x41, 0xd0, 0x22, 0x4d, 0xb3, 0xa1, 0x78, 0xaa, 0xee, 0xa4, 0x5a, 0x5b, + 0xd1, 0xa1, 0x08, 0x34, 0x65, 0xcc, 0x22, 0xc0, 0x40, 0x33, 0x04, 0x45, 0x87, 0xfe, 0x0c, 0x6f, + 0xcd, 0x52, 0x20, 0xe8, 0xa0, 0x34, 0xf6, 0xd0, 0xa2, 0xe8, 0xe4, 0xa5, 0x40, 0xa7, 0x42, 0xbc, + 0xa3, 0x2d, 0xd9, 0x4e, 0x1d, 0x23, 0x2d, 0x50, 0x74, 0xb1, 0xcd, 0x77, 0xdf, 0xfb, 0xde, 0xbd, + 0xef, 0xde, 0x7d, 0x07, 0x83, 0xf3, 0x9b, 0x79, 0x17, 0x75, 0xf3, 0xa4, 0xd7, 0x72, 0x30, 0xfd, + 0xa9, 0xb6, 0xda, 0x88, 0x20, 0x38, 0xdf, 0x40, 0xb8, 0x89, 0xb0, 0x89, 0xed, 0x07, 0xea, 0xa6, + 0xea, 0xa2, 0xae, 0xda, 0xbd, 0x26, 0x9e, 0x3d, 0x82, 0x13, 0x2f, 0x93, 0x0d, 0xaf, 0x6d, 0x9b, + 0x2d, 0xab, 0x4d, 0x7a, 0xf9, 0x30, 0x94, 0x77, 0x91, 0x8b, 0x0e, 0xfe, 0x62, 0x38, 0xd9, 0x45, + 0xc8, 0xf5, 0x1d, 0x0a, 0x59, 0xeb, 0xac, 0xe7, 0x89, 0xd7, 0x74, 0x30, 0xb1, 0x9a, 0x2d, 0x0a, + 0xc8, 0xfd, 0xc1, 0x83, 0xb7, 0x96, 0xb1, 0x5b, 0xeb, 0xac, 0x35, 0x3d, 0x52, 0x6d, 0xa3, 0x16, + 0xc2, 0x96, 0xaf, 0x59, 0xd8, 0x81, 0x0f, 0x79, 0x70, 0xc6, 0x0b, 0x3c, 0xe2, 0x59, 0xbe, 0x69, + 0x3b, 0x2d, 0x84, 0x3d, 0x92, 0xe5, 0x95, 0xf8, 0x62, 0x6a, 0x69, 0x5e, 0x1d, 0xdb, 0x65, 0xf7, + 0x9a, 0x7a, 0x13, 0x79, 0x81, 0x76, 0x77, 0x7b, 0x28, 0x73, 0x7b, 0x43, 0xf9, 0x5c, 0xcf, 0x6a, + 0xfa, 0x37, 0x72, 0x87, 0x32, 0x73, 0xdf, 0xbe, 0x90, 0x17, 0x5d, 0x8f, 0x6c, 0x74, 0xd6, 0xd4, + 0x06, 0x6a, 0xe6, 0x29, 0x01, 0xfb, 0x75, 0x15, 0xdb, 0x0f, 0x58, 0x77, 0x23, 0x2a, 0x6c, 0x64, + 0x58, 0x76, 0x91, 0x26, 0xc3, 0x65, 0x30, 0xd3, 0x0a, 0xb7, 0xe6, 0xb4, 0xb3, 0x31, 0x85, 0x5f, + 0x4c, 0x6b, 0xd7, 0xfe, 0x1c, 0xca, 0x57, 0x5f, 0x83, 0xaf, 0xd0, 0x68, 0x14, 0x6c, 0xbb, 0xed, + 0x60, 0x6c, 0xec, 0x53, 0xdc, 0x48, 0xfc, 0xba, 0x25, 0xf3, 0xb9, 0x5f, 0x78, 0x30, 0xbd, 0x8c, + 0xdd, 0x15, 0x44, 0x1c, 0x58, 0x07, 0xa9, 0x16, 0xeb, 0xdd, 0xf4, 0xec, 0x2c, 0xaf, 0xf0, 0x8b, + 0x09, 0xed, 0xfa, 0xce, 0x50, 0x06, 0x91, 0x24, 0xa5, 0xe2, 0x6f, 0x43, 0x79, 0x1c, 0xb4, 0x37, + 0x94, 0x21, 0x6d, 0x75, 0x2c, 0x98, 0x33, 0x40, 0xf4, 0x55, 0xb2, 0xe1, 0x6d, 0x30, 0xd5, 0x45, + 0xe4, 0x4d, 0xf6, 0x4c, 0xf3, 0xe1, 0x07, 0x20, 0x89, 0x5a, 0xc4, 0x43, 0x41, 0x36, 0xae, 0xf0, + 0x8b, 0x99, 0x25, 0x59, 0x3d, 0x66, 0x4c, 0xd4, 0x51, 0x27, 0x95, 0x10, 0x66, 0x30, 0x38, 0xeb, + 0xf4, 0x71, 0x0c, 0x80, 0x65, 0xec, 0x46, 0x6a, 0xfe, 0x3b, 0xcd, 0x56, 0xc0, 0x2c, 0x3b, 0x6b, + 0xf4, 0x06, 0x0d, 0x1f, 0x70, 0xc0, 0x4f, 0x41, 0xd2, 0x6a, 0xa2, 0x4e, 0x40, 0xb2, 0xf1, 0x57, + 0x4f, 0xdd, 0xfb, 0xa3, 0xa9, 0x3b, 0xd5, 0x6c, 0x31, 0x52, 0x26, 0xcd, 0x3d, 0x90, 0xae, 0x3b, + 0x9b, 0xfb, 0x83, 0x0f, 0x17, 0xc0, 0x14, 0xf1, 0x88, 0xef, 0x84, 0xaa, 0xcc, 0x1a, 0xf4, 0x03, + 0x2a, 0x20, 0x65, 0x3b, 0xb8, 0xd1, 0xf6, 0xe8, 0x21, 0xc4, 0xc2, 0xb5, 0xf1, 0x10, 0x63, 0xfb, + 0x3a, 0x06, 0xa6, 0x23, 0x95, 0xf5, 0xe3, 0x54, 0xbe, 0x34, 0xa9, 0xf2, 0xff, 0x56, 0xd6, 0x1f, + 0x92, 0x20, 0x3d, 0x61, 0x26, 0xda, 0x71, 0x6a, 0x5c, 0x38, 0x32, 0x73, 0xb1, 0x70, 0xd4, 0x66, + 0x99, 0x85, 0x1c, 0x92, 0xe2, 0x3e, 0x48, 0x62, 0x62, 0x91, 0x0e, 0x0e, 0x75, 0xc8, 0x2c, 0x5d, + 0x3c, 0xf6, 0x16, 0x44, 0x7c, 0xb5, 0x10, 0xaa, 0x89, 0x07, 0x96, 0xb4, 0xbf, 0x01, 0xca, 0x92, + 0x33, 0x18, 0x1d, 0xfc, 0x1c, 0xc0, 0x75, 0x2f, 0xb0, 0x7c, 0x93, 0x58, 0xbe, 0xdf, 0x33, 0xdb, + 0x0e, 0xee, 0xf8, 0x24, 0xbc, 0x6a, 0xa9, 0x25, 0xe5, 0xd8, 0x22, 0xf5, 0x11, 0xd0, 0x08, 0x71, + 0xda, 0x05, 0x66, 0x7c, 0x6f, 0xd3, 0x2a, 0x47, 0x99, 0x72, 0x86, 0x10, 0x06, 0xc7, 0x92, 0xe0, + 0x27, 0x20, 0x85, 0x43, 0xcb, 0x35, 0x47, 0x86, 0x9c, 0x4d, 0x84, 0xb5, 0x44, 0x95, 0xba, 0xb5, + 0x1a, 0xb9, 0xb5, 0x5a, 0x8f, 0xdc, 0x5a, 0x93, 0x58, 0x15, 0x36, 0x2f, 0x63, 0xc9, 0xb9, 0x47, + 0x2f, 0x64, 0xde, 0x00, 0x34, 0x32, 0x4a, 0x80, 0x1e, 0x10, 0xd8, 0x79, 0x9b, 0x4e, 0x60, 0xd3, + 0x0a, 0x53, 0x27, 0x56, 0xb8, 0xc8, 0x2a, 0x9c, 0xa7, 0x15, 0x0e, 0x33, 0xd0, 0x32, 0x19, 0x16, + 0xd6, 0x03, 0x3b, 0x2c, 0xf5, 0x15, 0x0f, 0xe6, 0x08, 0x22, 0x63, 0x4f, 0x44, 0xf2, 0xd5, 0x53, + 0x75, 0x87, 0x55, 0x58, 0xa0, 0x15, 0x26, 0xf2, 0x4e, 0xf7, 0x40, 0xa4, 0xc3, 0xdc, 0xe8, 0xaa, + 0xf9, 0xe0, 0x6c, 0x17, 0x11, 0x2f, 0x70, 0x47, 0x27, 0xdb, 0x66, 0x92, 0x4e, 0x9f, 0xd8, 0xf0, + 0x25, 0xb6, 0x9d, 0x2c, 0xdd, 0xce, 0x11, 0x0a, 0xda, 0xf1, 0x19, 0x1a, 0xaf, 0x8d, 0xc2, 0x61, + 0xcb, 0xeb, 0x80, 0x85, 0x0e, 0xc4, 0x9d, 0x39, 0xb1, 0x56, 0x6e, 0xf2, 0x75, 0x3c, 0x44, 0x40, + 0x2b, 0xcd, 0xd1, 0x28, 0x93, 0xf6, 0x46, 0xfa, 0xf1, 0x96, 0xcc, 0x3f, 0xdd, 0x92, 0xf9, 0xf0, + 0x46, 0x6d, 0xc7, 0x40, 0x6a, 0x7c, 0x80, 0x3e, 0x02, 0xf1, 0x9e, 0x83, 0xa9, 0x4d, 0x69, 0xea, + 0x88, 0xfd, 0xa7, 0xa1, 0x7c, 0xf9, 0x35, 0x04, 0x2c, 0x05, 0xc4, 0x18, 0xa5, 0xc2, 0x3b, 0x60, + 0xda, 0x5a, 0xc3, 0xc4, 0xf2, 0x98, 0xa1, 0x9d, 0x9a, 0x25, 0x4a, 0x87, 0x1f, 0x82, 0x58, 0x80, + 0xc2, 0xfb, 0x72, 0x7a, 0x92, 0x58, 0x80, 0xa0, 0x0b, 0xd2, 0x01, 0x32, 0xbf, 0xf0, 0xc8, 0x86, + 0xd9, 0x75, 0x08, 0x0a, 0x6f, 0xc3, 0xac, 0xa6, 0x9f, 0x8e, 0x69, 0x6f, 0x28, 0xcf, 0x53, 0x71, + 0xc7, 0xb9, 0x72, 0x06, 0x08, 0xd0, 0x7d, 0x8f, 0x6c, 0xac, 0x38, 0x04, 0x31, 0x73, 0xfa, 0x91, + 0x07, 0x89, 0xf0, 0xd5, 0xff, 0x87, 0x2c, 0xfa, 0x3f, 0xf2, 0xcc, 0x5f, 0xf9, 0x8e, 0x07, 0xe0, + 0x60, 0x11, 0x8a, 0x60, 0x4a, 0x5f, 0xae, 0xd6, 0x57, 0x05, 0x4e, 0x3c, 0xd3, 0x1f, 0x28, 0x29, + 0x1a, 0xd6, 0x9b, 0x2d, 0xd2, 0x83, 0xe7, 0x40, 0x7c, 0x55, 0xaf, 0x09, 0xbc, 0x38, 0xd7, 0x1f, + 0x28, 0xb3, 0x74, 0x65, 0xd5, 0xc1, 0x50, 0x02, 0xd3, 0x05, 0xad, 0x56, 0x2f, 0x94, 0xca, 0x42, + 0x4c, 0x3c, 0xdb, 0x1f, 0x28, 0x73, 0x74, 0xad, 0xc0, 0x4e, 0x7a, 0x01, 0xc4, 0xca, 0x15, 0x21, + 0x2e, 0xa6, 0xfb, 0x03, 0x65, 0x86, 0x2e, 0x95, 0x11, 0xbc, 0x0c, 0xd2, 0xe5, 0x8a, 0x79, 0xbf, + 0x54, 0xbf, 0x63, 0xae, 0xe8, 0xf5, 0x8a, 0x90, 0x10, 0x17, 0xfa, 0x03, 0x45, 0x88, 0xd6, 0x23, + 0xf9, 0xc5, 0xf4, 0xc3, 0x6f, 0x24, 0xee, 0xe9, 0x13, 0x89, 0xfb, 0xfe, 0x89, 0xc4, 0x5d, 0xf9, + 0x9d, 0x07, 0x99, 0x49, 0xb3, 0x1e, 0x6d, 0xab, 0x5c, 0xba, 0x27, 0x70, 0x74, 0x5b, 0x34, 0x58, + 0xf6, 0x7c, 0xf8, 0x1e, 0xc8, 0x14, 0xf5, 0x6a, 0xa5, 0x56, 0xaa, 0x9b, 0x55, 0xdd, 0x28, 0x55, + 0x8a, 0x02, 0x2f, 0x9e, 0xef, 0x0f, 0x94, 0x79, 0x0a, 0x61, 0x3e, 0x50, 0x75, 0xda, 0x1e, 0xb2, + 0xe1, 0xbb, 0x60, 0x6e, 0xa5, 0x52, 0x2f, 0x95, 0x6f, 0x47, 0xd8, 0x98, 0x78, 0xae, 0x3f, 0x50, + 0x20, 0xc5, 0xae, 0x84, 0x77, 0x8c, 0x41, 0xdf, 0x01, 0xc9, 0x6a, 0xa1, 0x56, 0xd3, 0x8b, 0x42, + 0x5c, 0x14, 0xfa, 0x03, 0x25, 0x4d, 0x31, 0x55, 0x0b, 0x63, 0xc7, 0x86, 0x0a, 0x98, 0x31, 0xf4, + 0xbb, 0xfa, 0xcd, 0xba, 0x5e, 0x14, 0x12, 0x22, 0xec, 0x0f, 0x94, 0x0c, 0x5d, 0x37, 0x9c, 0xcf, + 0x9c, 0x06, 0x71, 0xc2, 0xfc, 0x5b, 0x85, 0xd2, 0x3d, 0xbd, 0x28, 0x4c, 0x8d, 0xe7, 0xdf, 0xb2, + 0x3c, 0xdf, 0xb1, 0x27, 0xdb, 0xd5, 0xca, 0xdb, 0x2f, 0x25, 0xee, 0xf9, 0x4b, 0x89, 0xfb, 0x72, + 0x47, 0xe2, 0xb6, 0x77, 0x24, 0xfe, 0xd9, 0x8e, 0xc4, 0xff, 0xbc, 0x23, 0xf1, 0x8f, 0x76, 0x25, + 0xee, 0xd9, 0xae, 0xc4, 0x3d, 0xdf, 0x95, 0xb8, 0x8f, 0xff, 0xde, 0x02, 0xc7, 0xfe, 0x6b, 0x58, + 0x4b, 0x86, 0x2e, 0x73, 0xfd, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xe0, 0x2e, 0x55, 0x4b, + 0x0c, 0x00, 0x00, } func (this *MsgSubmitProposalBase) Equal(that interface{}) bool { @@ -676,6 +676,56 @@ func (this *Deposit) Equal(that interface{}) bool { } return true } +func (this *ProposalBase) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*ProposalBase) + if !ok { + that2, ok := that.(ProposalBase) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.ProposalID != that1.ProposalID { + return false + } + if this.Status != that1.Status { + return false + } + if !this.FinalTallyResult.Equal(&that1.FinalTallyResult) { + return false + } + if !this.SubmitTime.Equal(that1.SubmitTime) { + return false + } + if !this.DepositEndTime.Equal(that1.DepositEndTime) { + return false + } + if len(this.TotalDeposit) != len(that1.TotalDeposit) { + return false + } + for i := range this.TotalDeposit { + if !this.TotalDeposit[i].Equal(&that1.TotalDeposit[i]) { + return false + } + } + if !this.VotingStartTime.Equal(that1.VotingStartTime) { + return false + } + if !this.VotingEndTime.Equal(that1.VotingEndTime) { + return false + } + return true +} func (this *TallyResult) Equal(that interface{}) bool { if that == nil { return this == nil diff --git a/x/gov/types/types.proto b/x/gov/types/types.proto index 6b8b509441..855826516a 100644 --- a/x/gov/types/types.proto +++ b/x/gov/types/types.proto @@ -91,6 +91,7 @@ message Deposit { // all static fields (i.e fields excluding the dynamic Content). A full proposal // extends the ProposalBase with Content. message ProposalBase { + option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = true; option (gogoproto.face) = true;