diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 26b5107..8d142b0 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -43900,6 +43900,40 @@ paths: additionalProperties: {} tags: - Query + /planetmint-go/machine/get_machine_by_public_key/{publicKey}: + get: + summary: Queries a list of GetMachineByPublicKey items. + operationId: PlanetmintgoMachineGetMachineByPublicKey + responses: + '200': + description: A successful response. + schema: + type: object + default: + description: An unexpected error response. + schema: + type: object + properties: + code: + type: integer + format: int32 + message: + type: string + details: + type: array + items: + type: object + properties: + '@type': + type: string + additionalProperties: {} + parameters: + - name: publicKey + in: path + required: true + type: string + tags: + - Query /planetmint-go/machine/params: get: summary: Parameters queries the parameters of the module. @@ -71543,6 +71577,8 @@ definitions: planetmintgo.machine.Params: type: object description: Params defines the parameters for the module. + planetmintgo.machine.QueryGetMachineByPublicKeyResponse: + type: object planetmintgo.machine.QueryParamsResponse: type: object properties: diff --git a/proto/planetmintgo/machine/query.proto b/proto/planetmintgo/machine/query.proto index 5bd16ac..37e9754 100644 --- a/proto/planetmintgo/machine/query.proto +++ b/proto/planetmintgo/machine/query.proto @@ -1,4 +1,5 @@ syntax = "proto3"; + package planetmintgo.machine; import "gogoproto/gogo.proto"; @@ -10,17 +11,32 @@ option go_package = "planetmint-go/x/machine/types"; // Query defines the gRPC querier service. service Query { + // Parameters queries the parameters of the module. - rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { + rpc Params (QueryParamsRequest) returns (QueryParamsResponse) { option (google.api.http).get = "/planetmint-go/machine/params"; + + } + + // Queries a list of GetMachineByPublicKey items. + rpc GetMachineByPublicKey (QueryGetMachineByPublicKeyRequest) returns (QueryGetMachineByPublicKeyResponse) { + option (google.api.http).get = "/planetmint-go/machine/get_machine_by_public_key/{publicKey}"; + } } - // QueryParamsRequest is request type for the Query/Params RPC method. message QueryParamsRequest {} // QueryParamsResponse is response type for the Query/Params RPC method. message QueryParamsResponse { + // params holds all the parameters of this module. Params params = 1 [(gogoproto.nullable) = false]; -} \ No newline at end of file +} + +message QueryGetMachineByPublicKeyRequest { + string publicKey = 1; +} + +message QueryGetMachineByPublicKeyResponse {} + diff --git a/testutil/keeper/asset.go b/testutil/keeper/asset.go index 7bd3c92..97db0e8 100644 --- a/testutil/keeper/asset.go +++ b/testutil/keeper/asset.go @@ -48,7 +48,10 @@ func AssetKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { ctrl := gomock.NewController(t) mk := assettestutils.NewMockMachineKeeper(ctrl) sk, pk := sample.KeyPair() - mk.EXPECT().GetMachine(ctx, pk).Return(sample.Machine(pk, pk, pk), true).AnyTimes() + id := sample.MachineIndex(pk, pk, pk) + mk.EXPECT().GetMachineIndex(ctx, pk).Return(id, true).AnyTimes() + mk.EXPECT().GetMachineIndex(ctx, sk).Return(id, false).AnyTimes() + mk.EXPECT().GetMachine(ctx, id).Return(sample.Machine(pk, pk, pk), true).AnyTimes() mk.EXPECT().GetMachine(ctx, sk).Return(sample.Machine(pk, pk, pk), false).AnyTimes() k := keeper.NewKeeper( diff --git a/testutil/sample/sample.go b/testutil/sample/sample.go index f7c9b9f..44592df 100644 --- a/testutil/sample/sample.go +++ b/testutil/sample/sample.go @@ -37,6 +37,14 @@ func Machine(machineId string, pkPM string, pkL string) machinetypes.Machine { return m } +func MachineIndex(machineId string, pkPM string, pkL string) machinetypes.MachineIndex { + return machinetypes.MachineIndex{ + MachineId: machineId, + IssuerPlanetmint: pkPM, + IssuerLiquid: pkL, + } +} + func Metadata() machinetypes.Metadata { return machinetypes.Metadata{ Gps: map[string]string{ diff --git a/x/asset/keeper/msg_server_notarize_asset.go b/x/asset/keeper/msg_server_notarize_asset.go index f086bb7..0bedfc3 100644 --- a/x/asset/keeper/msg_server_notarize_asset.go +++ b/x/asset/keeper/msg_server_notarize_asset.go @@ -15,12 +15,14 @@ import ( func (k msgServer) NotarizeAsset(goCtx context.Context, msg *types.MsgNotarizeAsset) (*types.MsgNotarizeAssetResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - machine, found := k.machineKeeper.GetMachine(ctx, msg.Creator) + machineIndex, found := k.machineKeeper.GetMachineIndex(ctx, msg.Creator) if !found { return &types.MsgNotarizeAssetResponse{}, errors.New("machine not found") } + machine, _ := k.machineKeeper.GetMachine(ctx, machineIndex) + valid := ValidateSignature(msg.CidHash, msg.Sign, msg.Creator) if !valid { return &types.MsgNotarizeAssetResponse{}, errors.New("invalid signature") diff --git a/x/asset/testutil/expected_keepers_mocks.go b/x/asset/testutil/expected_keepers_mocks.go index b66b548..b47675d 100644 --- a/x/asset/testutil/expected_keepers_mocks.go +++ b/x/asset/testutil/expected_keepers_mocks.go @@ -111,16 +111,31 @@ func (m *MockMachineKeeper) EXPECT() *MockMachineKeeperMockRecorder { } // GetMachine mocks base method. -func (m *MockMachineKeeper) GetMachine(ctx types.Context, pubKey string) (types1.Machine, bool) { +func (m *MockMachineKeeper) GetMachine(ctx types.Context, index types1.MachineIndex) (types1.Machine, bool) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetMachine", ctx, pubKey) + ret := m.ctrl.Call(m, "GetMachine", ctx, index) ret0, _ := ret[0].(types1.Machine) ret1, _ := ret[1].(bool) return ret0, ret1 } // GetMachine indicates an expected call of GetMachine. -func (mr *MockMachineKeeperMockRecorder) GetMachine(ctx, pubKey interface{}) *gomock.Call { +func (mr *MockMachineKeeperMockRecorder) GetMachine(ctx, index interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMachine", reflect.TypeOf((*MockMachineKeeper)(nil).GetMachine), ctx, pubKey) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMachine", reflect.TypeOf((*MockMachineKeeper)(nil).GetMachine), ctx, index) +} + +// GetMachineIndex mocks base method. +func (m *MockMachineKeeper) GetMachineIndex(ctx types.Context, pubKey string) (types1.MachineIndex, bool) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetMachineIndex", ctx, pubKey) + ret0, _ := ret[0].(types1.MachineIndex) + ret1, _ := ret[1].(bool) + return ret0, ret1 +} + +// GetMachineIndex indicates an expected call of GetMachineIndex. +func (mr *MockMachineKeeperMockRecorder) GetMachineIndex(ctx, pubKey interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMachineIndex", reflect.TypeOf((*MockMachineKeeper)(nil).GetMachineIndex), ctx, pubKey) } diff --git a/x/asset/types/expected_keepers.go b/x/asset/types/expected_keepers.go index a455875..e7ae38a 100644 --- a/x/asset/types/expected_keepers.go +++ b/x/asset/types/expected_keepers.go @@ -20,5 +20,6 @@ type BankKeeper interface { } type MachineKeeper interface { - GetMachine(ctx sdk.Context, pubKey string) (val machinetypes.Machine, found bool) + GetMachine(ctx sdk.Context, index machinetypes.MachineIndex) (val machinetypes.Machine, found bool) + GetMachineIndex(ctx sdk.Context, pubKey string) (val machinetypes.MachineIndex, found bool) } diff --git a/x/machine/client/cli/query.go b/x/machine/client/cli/query.go index f126dcc..2c1702d 100644 --- a/x/machine/client/cli/query.go +++ b/x/machine/client/cli/query.go @@ -25,6 +25,8 @@ func GetQueryCmd(queryRoute string) *cobra.Command { } cmd.AddCommand(CmdQueryParams()) + cmd.AddCommand(CmdGetMachineByPublicKey()) + // this line is used by starport scaffolding # 1 return cmd diff --git a/x/machine/client/cli/query_get_machine_by_public_key.go b/x/machine/client/cli/query_get_machine_by_public_key.go new file mode 100644 index 0000000..3b95d3c --- /dev/null +++ b/x/machine/client/cli/query_get_machine_by_public_key.go @@ -0,0 +1,46 @@ +package cli + +import ( + "strconv" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/spf13/cobra" + "planetmint-go/x/machine/types" +) + +var _ = strconv.Itoa(0) + +func CmdGetMachineByPublicKey() *cobra.Command { + cmd := &cobra.Command{ + Use: "get-machine-by-public-key [public-key]", + Short: "Query get-machine-by-public-key", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) (err error) { + reqPublicKey := args[0] + + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(clientCtx) + + params := &types.QueryGetMachineByPublicKeyRequest{ + + PublicKey: reqPublicKey, + } + + res, err := queryClient.GetMachineByPublicKey(cmd.Context(), params) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/machine/keeper/query_get_machine_by_public_key.go b/x/machine/keeper/query_get_machine_by_public_key.go new file mode 100644 index 0000000..160bfb2 --- /dev/null +++ b/x/machine/keeper/query_get_machine_by_public_key.go @@ -0,0 +1,23 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "planetmint-go/x/machine/types" +) + +func (k Keeper) GetMachineByPublicKey(goCtx context.Context, req *types.QueryGetMachineByPublicKeyRequest) (*types.QueryGetMachineByPublicKeyResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + + ctx := sdk.UnwrapSDKContext(goCtx) + + // TODO: Process the query + _ = ctx + + return &types.QueryGetMachineByPublicKeyResponse{}, nil +} diff --git a/x/machine/types/query.pb.go b/x/machine/types/query.pb.go index 991c934..0be4585 100644 --- a/x/machine/types/query.pb.go +++ b/x/machine/types/query.pb.go @@ -113,34 +113,122 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } +type QueryGetMachineByPublicKeyRequest struct { + PublicKey string `protobuf:"bytes,1,opt,name=publicKey,proto3" json:"publicKey,omitempty"` +} + +func (m *QueryGetMachineByPublicKeyRequest) Reset() { *m = QueryGetMachineByPublicKeyRequest{} } +func (m *QueryGetMachineByPublicKeyRequest) String() string { return proto.CompactTextString(m) } +func (*QueryGetMachineByPublicKeyRequest) ProtoMessage() {} +func (*QueryGetMachineByPublicKeyRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_bf7841d43d757203, []int{2} +} +func (m *QueryGetMachineByPublicKeyRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetMachineByPublicKeyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetMachineByPublicKeyRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryGetMachineByPublicKeyRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetMachineByPublicKeyRequest.Merge(m, src) +} +func (m *QueryGetMachineByPublicKeyRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryGetMachineByPublicKeyRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetMachineByPublicKeyRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetMachineByPublicKeyRequest proto.InternalMessageInfo + +func (m *QueryGetMachineByPublicKeyRequest) GetPublicKey() string { + if m != nil { + return m.PublicKey + } + return "" +} + +type QueryGetMachineByPublicKeyResponse struct { +} + +func (m *QueryGetMachineByPublicKeyResponse) Reset() { *m = QueryGetMachineByPublicKeyResponse{} } +func (m *QueryGetMachineByPublicKeyResponse) String() string { return proto.CompactTextString(m) } +func (*QueryGetMachineByPublicKeyResponse) ProtoMessage() {} +func (*QueryGetMachineByPublicKeyResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_bf7841d43d757203, []int{3} +} +func (m *QueryGetMachineByPublicKeyResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryGetMachineByPublicKeyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryGetMachineByPublicKeyResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryGetMachineByPublicKeyResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryGetMachineByPublicKeyResponse.Merge(m, src) +} +func (m *QueryGetMachineByPublicKeyResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryGetMachineByPublicKeyResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryGetMachineByPublicKeyResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryGetMachineByPublicKeyResponse proto.InternalMessageInfo + func init() { proto.RegisterType((*QueryParamsRequest)(nil), "planetmintgo.machine.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "planetmintgo.machine.QueryParamsResponse") + proto.RegisterType((*QueryGetMachineByPublicKeyRequest)(nil), "planetmintgo.machine.QueryGetMachineByPublicKeyRequest") + proto.RegisterType((*QueryGetMachineByPublicKeyResponse)(nil), "planetmintgo.machine.QueryGetMachineByPublicKeyResponse") } func init() { proto.RegisterFile("planetmintgo/machine/query.proto", fileDescriptor_bf7841d43d757203) } var fileDescriptor_bf7841d43d757203 = []byte{ - // 292 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0x31, 0x4b, 0x03, 0x31, - 0x18, 0x86, 0x2f, 0xa2, 0x1d, 0xe2, 0x16, 0x6f, 0x90, 0xa3, 0x4d, 0xeb, 0x81, 0x50, 0x05, 0x2f, - 0xb4, 0x0e, 0x82, 0x63, 0x7f, 0x81, 0xed, 0xe8, 0x96, 0x2b, 0x21, 0x1e, 0xf4, 0xf2, 0xa5, 0x97, - 0x54, 0xec, 0x2a, 0xce, 0x22, 0xf8, 0xa7, 0x3a, 0x16, 0x5c, 0x9c, 0x44, 0xee, 0xfc, 0x21, 0xd2, - 0x4b, 0x50, 0x4b, 0x6f, 0x70, 0x0b, 0x5f, 0x9e, 0xe7, 0xcd, 0xfb, 0x05, 0xf7, 0xf4, 0x8c, 0x2b, - 0x61, 0xf3, 0x4c, 0x59, 0x09, 0x2c, 0xe7, 0xd3, 0xbb, 0x4c, 0x09, 0x36, 0x5f, 0x88, 0x62, 0x99, - 0xe8, 0x02, 0x2c, 0x90, 0xf0, 0x2f, 0x91, 0x78, 0x22, 0x0a, 0x25, 0x48, 0xa8, 0x01, 0xb6, 0x39, - 0x39, 0x36, 0x6a, 0x4b, 0x00, 0x39, 0x13, 0x8c, 0xeb, 0x8c, 0x71, 0xa5, 0xc0, 0x72, 0x9b, 0x81, - 0x32, 0xfe, 0xf6, 0x7c, 0x0a, 0x26, 0x07, 0xc3, 0x52, 0x6e, 0xfc, 0x13, 0xec, 0x7e, 0x90, 0x0a, - 0xcb, 0x07, 0x4c, 0x73, 0x99, 0xa9, 0x1a, 0xf6, 0xec, 0x49, 0x63, 0x2f, 0xcd, 0x0b, 0x9e, 0xfb, - 0xb8, 0x38, 0xc4, 0x64, 0xbc, 0x09, 0xb9, 0xa9, 0x87, 0x13, 0x31, 0x5f, 0x08, 0x63, 0xe3, 0x31, - 0x3e, 0xda, 0x9a, 0x1a, 0x0d, 0xca, 0x08, 0x72, 0x8d, 0x5b, 0x4e, 0x3e, 0x46, 0x3d, 0xd4, 0x3f, - 0x1c, 0xb6, 0x93, 0xa6, 0xb5, 0x12, 0x67, 0x8d, 0xf6, 0x57, 0x1f, 0xdd, 0x60, 0xe2, 0x8d, 0xe1, - 0x33, 0xc2, 0x07, 0x75, 0x26, 0x79, 0x42, 0xb8, 0xe5, 0x10, 0xd2, 0x6f, 0x0e, 0xd8, 0x6d, 0x14, - 0x9d, 0xfd, 0x83, 0x74, 0x2d, 0xe3, 0xd3, 0xc7, 0xb7, 0xaf, 0xd7, 0xbd, 0x2e, 0xe9, 0xb0, 0x5f, - 0xe5, 0x62, 0x67, 0xff, 0xd1, 0xd5, 0xaa, 0xa4, 0x68, 0x5d, 0x52, 0xf4, 0x59, 0x52, 0xf4, 0x52, - 0xd1, 0x60, 0x5d, 0xd1, 0xe0, 0xbd, 0xa2, 0xc1, 0x6d, 0x67, 0xdb, 0x7b, 0xf8, 0x31, 0xed, 0x52, - 0x0b, 0x93, 0xb6, 0xea, 0x9f, 0xbb, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x41, 0xf4, 0x49, 0x08, - 0xf6, 0x01, 0x00, 0x00, + // 391 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0x6a, 0x1a, 0x41, + 0x1c, 0xc7, 0x77, 0xa5, 0x15, 0x9c, 0xde, 0xa6, 0x16, 0xca, 0xa2, 0xab, 0x2e, 0x2d, 0xd8, 0x42, + 0x77, 0xd0, 0x1e, 0x2c, 0xa5, 0x14, 0x22, 0x81, 0x1c, 0x42, 0x40, 0x3d, 0xe6, 0xb2, 0xcc, 0xca, + 0xb0, 0x59, 0xe2, 0xce, 0x8c, 0xce, 0x18, 0xb2, 0x84, 0x5c, 0x42, 0x1e, 0x20, 0x90, 0x97, 0xf2, + 0x28, 0xe4, 0x92, 0x53, 0x48, 0x34, 0x0f, 0x12, 0x9c, 0x99, 0x68, 0xc4, 0x8d, 0x24, 0xb7, 0xe1, + 0xb7, 0x9f, 0xef, 0x9f, 0xf9, 0xed, 0x80, 0x2a, 0x1f, 0x60, 0x4a, 0x64, 0x12, 0x53, 0x19, 0x31, + 0x94, 0xe0, 0xfe, 0x51, 0x4c, 0x09, 0x1a, 0x8e, 0xc9, 0x28, 0xf5, 0xf9, 0x88, 0x49, 0x06, 0x8b, + 0x2f, 0x09, 0xdf, 0x10, 0x4e, 0x31, 0x62, 0x11, 0x53, 0x00, 0x5a, 0x9c, 0x34, 0xeb, 0x94, 0x22, + 0xc6, 0xa2, 0x01, 0x41, 0x98, 0xc7, 0x08, 0x53, 0xca, 0x24, 0x96, 0x31, 0xa3, 0xc2, 0x7c, 0xfd, + 0xd9, 0x67, 0x22, 0x61, 0x02, 0x85, 0x58, 0x98, 0x08, 0x74, 0xd2, 0x08, 0x89, 0xc4, 0x0d, 0xc4, + 0x71, 0x14, 0x53, 0x05, 0x1b, 0xb6, 0x96, 0xd9, 0x8b, 0xe3, 0x11, 0x4e, 0x8c, 0x9d, 0x57, 0x04, + 0xb0, 0xbb, 0x30, 0xe9, 0xa8, 0x61, 0x8f, 0x0c, 0xc7, 0x44, 0x48, 0xaf, 0x0b, 0x3e, 0xaf, 0x4d, + 0x05, 0x67, 0x54, 0x10, 0xf8, 0x17, 0xe4, 0xb5, 0xf8, 0xab, 0x5d, 0xb5, 0xeb, 0x9f, 0x9a, 0x25, + 0x3f, 0xeb, 0x5a, 0xbe, 0x56, 0xb5, 0x3f, 0x4c, 0xee, 0x2a, 0x56, 0xcf, 0x28, 0xbc, 0x1d, 0x50, + 0x53, 0x96, 0x7b, 0x44, 0x1e, 0x68, 0xae, 0x9d, 0x76, 0xc6, 0xe1, 0x20, 0xee, 0xef, 0x93, 0xd4, + 0xe4, 0xc2, 0x12, 0x28, 0xf0, 0xe7, 0x99, 0xca, 0x28, 0xf4, 0x56, 0x03, 0xef, 0x1b, 0xf0, 0xb6, + 0x59, 0xe8, 0x92, 0xcd, 0x87, 0x1c, 0xf8, 0xa8, 0x30, 0x78, 0x69, 0x83, 0xbc, 0xee, 0x02, 0xeb, + 0xd9, 0x4d, 0x37, 0xaf, 0xee, 0xfc, 0x78, 0x03, 0xa9, 0x93, 0xbc, 0xef, 0x17, 0x37, 0x8f, 0xd7, + 0xb9, 0x0a, 0x2c, 0xa3, 0x95, 0xe4, 0xd7, 0xc6, 0xa2, 0xe1, 0xd4, 0x06, 0x5f, 0x32, 0x2b, 0xc3, + 0xd6, 0x96, 0xac, 0x6d, 0x7b, 0x72, 0xfe, 0xbc, 0x5f, 0x68, 0x3a, 0xef, 0xaa, 0xce, 0xff, 0xe1, + 0xbf, 0x57, 0x3a, 0x47, 0x44, 0x06, 0xe6, 0x1c, 0x84, 0x69, 0xa0, 0x97, 0x1f, 0x1c, 0x93, 0x14, + 0x9d, 0x2d, 0x7f, 0xc4, 0x79, 0xbb, 0x35, 0x99, 0xb9, 0xf6, 0x74, 0xe6, 0xda, 0xf7, 0x33, 0xd7, + 0xbe, 0x9a, 0xbb, 0xd6, 0x74, 0xee, 0x5a, 0xb7, 0x73, 0xd7, 0x3a, 0x2c, 0xaf, 0xdb, 0x9e, 0x2e, + 0x8d, 0x65, 0xca, 0x89, 0x08, 0xf3, 0xea, 0xd5, 0xfd, 0x7e, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x05, + 0xe2, 0x2b, 0xbf, 0x32, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -157,6 +245,8 @@ const _ = grpc.SupportPackageIsVersion4 type QueryClient interface { // Parameters queries the parameters of the module. Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + // Queries a list of GetMachineByPublicKey items. + GetMachineByPublicKey(ctx context.Context, in *QueryGetMachineByPublicKeyRequest, opts ...grpc.CallOption) (*QueryGetMachineByPublicKeyResponse, error) } type queryClient struct { @@ -176,10 +266,21 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . return out, nil } +func (c *queryClient) GetMachineByPublicKey(ctx context.Context, in *QueryGetMachineByPublicKeyRequest, opts ...grpc.CallOption) (*QueryGetMachineByPublicKeyResponse, error) { + out := new(QueryGetMachineByPublicKeyResponse) + err := c.cc.Invoke(ctx, "/planetmintgo.machine.Query/GetMachineByPublicKey", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // QueryServer is the server API for Query service. type QueryServer interface { // Parameters queries the parameters of the module. Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + // Queries a list of GetMachineByPublicKey items. + GetMachineByPublicKey(context.Context, *QueryGetMachineByPublicKeyRequest) (*QueryGetMachineByPublicKeyResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -189,6 +290,9 @@ type UnimplementedQueryServer struct { func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } +func (*UnimplementedQueryServer) GetMachineByPublicKey(ctx context.Context, req *QueryGetMachineByPublicKeyRequest) (*QueryGetMachineByPublicKeyResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetMachineByPublicKey not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -212,6 +316,24 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf return interceptor(ctx, in, info, handler) } +func _Query_GetMachineByPublicKey_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryGetMachineByPublicKeyRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).GetMachineByPublicKey(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/planetmintgo.machine.Query/GetMachineByPublicKey", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).GetMachineByPublicKey(ctx, req.(*QueryGetMachineByPublicKeyRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "planetmintgo.machine.Query", HandlerType: (*QueryServer)(nil), @@ -220,6 +342,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "Params", Handler: _Query_Params_Handler, }, + { + MethodName: "GetMachineByPublicKey", + Handler: _Query_GetMachineByPublicKey_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "planetmintgo/machine/query.proto", @@ -281,6 +407,59 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *QueryGetMachineByPublicKeyRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryGetMachineByPublicKeyRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetMachineByPublicKeyRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.PublicKey) > 0 { + i -= len(m.PublicKey) + copy(dAtA[i:], m.PublicKey) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PublicKey))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryGetMachineByPublicKeyResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryGetMachineByPublicKeyResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetMachineByPublicKeyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { offset -= sovQuery(v) base := offset @@ -312,6 +491,28 @@ func (m *QueryParamsResponse) Size() (n int) { return n } +func (m *QueryGetMachineByPublicKeyRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PublicKey) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryGetMachineByPublicKeyResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -451,6 +652,138 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryGetMachineByPublicKeyRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryGetMachineByPublicKeyRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryGetMachineByPublicKeyRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PublicKey", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PublicKey = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryGetMachineByPublicKeyResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryGetMachineByPublicKeyResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryGetMachineByPublicKeyResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/machine/types/query.pb.gw.go b/x/machine/types/query.pb.gw.go index 29f0814..91257f3 100644 --- a/x/machine/types/query.pb.gw.go +++ b/x/machine/types/query.pb.gw.go @@ -51,6 +51,60 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal } +func request_Query_GetMachineByPublicKey_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetMachineByPublicKeyRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["publicKey"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "publicKey") + } + + protoReq.PublicKey, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "publicKey", err) + } + + msg, err := client.GetMachineByPublicKey(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_GetMachineByPublicKey_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryGetMachineByPublicKeyRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["publicKey"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "publicKey") + } + + protoReq.PublicKey, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "publicKey", err) + } + + msg, err := server.GetMachineByPublicKey(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -80,6 +134,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_GetMachineByPublicKey_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_GetMachineByPublicKey_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_GetMachineByPublicKey_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -141,13 +218,37 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_GetMachineByPublicKey_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_GetMachineByPublicKey_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_GetMachineByPublicKey_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } var ( pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"planetmint-go", "machine", "params"}, "", runtime.AssumeColonVerbOpt(true))) + + pattern_Query_GetMachineByPublicKey_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"planetmint-go", "machine", "get_machine_by_public_key", "publicKey"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( forward_Query_Params_0 = runtime.ForwardResponseMessage + + forward_Query_GetMachineByPublicKey_0 = runtime.ForwardResponseMessage )