added QueryGetMachineByPublicKey handler and updated proto files

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>

proto/planetmintgo/machine/query.proto

@@ -6,6 +6,7 @@ import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "planetmintgo/machine/params.proto";
+import "planetmintgo/machine/machine.proto";
 
 option go_package = "planetmint-go/x/machine/types";
 
@@ -38,5 +39,7 @@ message QueryGetMachineByPublicKeyRequest {
   string publicKey = 1;
 }
 
-message QueryGetMachineByPublicKeyResponse {}
+message QueryGetMachineByPublicKeyResponse {
+  Machine machine = 1;
+}
 

x/machine/keeper/machine_test.go

@@ -19,6 +19,7 @@ func createNMachine(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.Machi
 		items[i].IssuerPlanetmint = fmt.Sprintf("issuerPlanetmint%v", i)
 		items[i].IssuerLiquid = fmt.Sprintf("issuerLiquid%v", i)
 		keeper.StoreMachine(ctx, items[i])
+		keeper.StoreMachineIndex(ctx, items[i])
 	}
 	return items
 }

x/machine/keeper/query_get_machine_by_public_key.go

@@ -3,10 +3,11 @@ package keeper
 import (
 	"context"
 
+	"planetmint-go/x/machine/types"
+
 	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) {
@@ -16,8 +17,12 @@ func (k Keeper) GetMachineByPublicKey(goCtx context.Context, req *types.QueryGet
 
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	// TODO: Process the query
+	machineIndex, found := k.GetMachineIndex(ctx, req.PublicKey)
-	_ = ctx
+	if !found {
+		return nil, status.Error(codes.NotFound, "machine not found")
+	}
 
-	return &types.QueryGetMachineByPublicKeyResponse{}, nil
+	machine, _ := k.GetMachine(ctx, machineIndex)
+
+	return &types.QueryGetMachineByPublicKeyResponse{Machine: &machine}, nil
 }

x/machine/keeper/query_get_machine_by_public_key_test.go

@@ -0,0 +1,54 @@
+package keeper_test
+
+import (
+	keepertest "planetmint-go/testutil/keeper"
+	"planetmint-go/x/machine/types"
+	"testing"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+func TestGetMachineByPublicKey(t *testing.T) {
+	keeper, ctx := keepertest.MachineKeeper(t)
+	wctx := sdk.WrapSDKContext(ctx)
+	msgs := createNMachine(keeper, ctx, 1)
+	for _, tc := range []struct {
+		desc     string
+		request  *types.QueryGetMachineByPublicKeyRequest
+		response *types.QueryGetMachineByPublicKeyResponse
+		err      error
+	}{
+		{
+			desc:     "GetByMachineId",
+			request:  &types.QueryGetMachineByPublicKeyRequest{PublicKey: msgs[0].MachineId},
+			response: &types.QueryGetMachineByPublicKeyResponse{Machine: &msgs[0]},
+		},
+		{
+			desc:     "GetByIssuerPlanetmint",
+			request:  &types.QueryGetMachineByPublicKeyRequest{PublicKey: msgs[0].IssuerPlanetmint},
+			response: &types.QueryGetMachineByPublicKeyResponse{Machine: &msgs[0]},
+		},
+		{
+			desc:     "GetByIssuerLiquid",
+			request:  &types.QueryGetMachineByPublicKeyRequest{PublicKey: msgs[0].IssuerLiquid},
+			response: &types.QueryGetMachineByPublicKeyResponse{Machine: &msgs[0]},
+		}, {
+			desc:    "MachineNotFound",
+			request: &types.QueryGetMachineByPublicKeyRequest{PublicKey: "invalid key"},
+			err:     status.Error(codes.NotFound, "machine not found"),
+		},
+	} {
+		tc := tc
+		t.Run(tc.desc, func(t *testing.T) {
+			response, err := keeper.GetMachineByPublicKey(wctx, tc.request)
+			if tc.err != nil {
+				require.ErrorIs(t, err, tc.err)
+			} else {
+				require.Equal(t, tc.response, response)
+			}
+		})
+	}
+}

x/machine/types/query.pb.go

@@ -158,6 +158,7 @@ func (m *QueryGetMachineByPublicKeyRequest) GetPublicKey() string {
 }
 
 type QueryGetMachineByPublicKeyResponse struct {
+	Machine *Machine `protobuf:"bytes,1,opt,name=machine,proto3" json:"machine,omitempty"`
 }
 
 func (m *QueryGetMachineByPublicKeyResponse) Reset()         { *m = QueryGetMachineByPublicKeyResponse{} }
@@ -193,6 +194,13 @@ func (m *QueryGetMachineByPublicKeyResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_QueryGetMachineByPublicKeyResponse proto.InternalMessageInfo
 
+func (m *QueryGetMachineByPublicKeyResponse) GetMachine() *Machine {
+	if m != nil {
+		return m.Machine
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*QueryParamsRequest)(nil), "planetmintgo.machine.QueryParamsRequest")
 	proto.RegisterType((*QueryParamsResponse)(nil), "planetmintgo.machine.QueryParamsResponse")
@@ -203,32 +211,33 @@ func init() {
 func init() { proto.RegisterFile("planetmintgo/machine/query.proto", fileDescriptor_bf7841d43d757203) }
 
 var fileDescriptor_bf7841d43d757203 = []byte{
-	// 391 bytes of a gzipped FileDescriptorProto
+	// 412 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,
+	0x1c, 0xc7, 0x77, 0xa5, 0xb5, 0x38, 0xbd, 0x4d, 0x2d, 0x94, 0x45, 0x57, 0x5d, 0x28, 0xd8, 0x42,
-	0x77, 0xd0, 0x1e, 0x2c, 0xa5, 0x14, 0x22, 0x81, 0x1c, 0x42, 0x40, 0x3d, 0xe6, 0xb2, 0xcc, 0xca,
+	0x77, 0xd0, 0x1e, 0x2c, 0xa5, 0x14, 0x2a, 0x85, 0x1e, 0x4a, 0x41, 0xf7, 0x58, 0x28, 0xcb, 0xac,
-	0xb0, 0x59, 0xe2, 0xce, 0x8c, 0xce, 0x18, 0xb2, 0x84, 0x5c, 0x42, 0x1e, 0x20, 0x90, 0x97, 0xf2,
+	0x0c, 0xdb, 0x25, 0xee, 0xcc, 0xe8, 0x8c, 0x21, 0x4b, 0xc8, 0x25, 0xe4, 0x01, 0x02, 0x79, 0x29,
-	0x28, 0xe4, 0x92, 0x53, 0x48, 0x34, 0x0f, 0x12, 0x9c, 0x99, 0x68, 0xc4, 0x8d, 0x24, 0xb7, 0xe1,
+	0x8f, 0x42, 0x2e, 0x39, 0x85, 0x44, 0xf3, 0x20, 0xc1, 0x99, 0x51, 0x23, 0x6e, 0x24, 0x39, 0x39,
-	0xb7, 0x9f, 0xef, 0x9f, 0xf9, 0xed, 0x80, 0x2a, 0x1f, 0x60, 0x4a, 0x64, 0x12, 0x53, 0x19, 0x31,
+	0x8c, 0x9f, 0xef, 0x9f, 0xdf, 0xfc, 0x16, 0xd4, 0xf9, 0x10, 0x53, 0x22, 0xd3, 0x84, 0xca, 0x98,
-	0x94, 0xe0, 0xfe, 0x51, 0x4c, 0x09, 0x1a, 0x8e, 0xc9, 0x28, 0xf5, 0xf9, 0x88, 0x49, 0x06, 0x8b,
+	0xa1, 0x14, 0x0f, 0xfe, 0x27, 0x94, 0xa0, 0xd1, 0x84, 0x8c, 0x33, 0x9f, 0x8f, 0x99, 0x64, 0xb0,
-	0x2f, 0x09, 0xdf, 0x10, 0x4e, 0x31, 0x62, 0x11, 0x53, 0x00, 0x5a, 0x9c, 0x34, 0xeb, 0x94, 0x22,
+	0xfc, 0x90, 0xf0, 0x0d, 0xe1, 0x94, 0x63, 0x16, 0x33, 0x05, 0xa0, 0xe5, 0x49, 0xb3, 0x4e, 0x25,
-	0xc6, 0xa2, 0x01, 0x41, 0x98, 0xc7, 0x08, 0x53, 0xca, 0x24, 0x96, 0x31, 0xa3, 0xc2, 0x7c, 0xfd,
+	0x66, 0x2c, 0x1e, 0x12, 0x84, 0x79, 0x82, 0x30, 0xa5, 0x4c, 0x62, 0x99, 0x30, 0x2a, 0xcc, 0xbf,
-	0xd9, 0x67, 0x22, 0x61, 0x02, 0x85, 0x58, 0x98, 0x08, 0x74, 0xd2, 0x08, 0x89, 0xc4, 0x0d, 0xc4,
+	0x1f, 0x07, 0x4c, 0xa4, 0x4c, 0xa0, 0x08, 0x0b, 0x13, 0x81, 0x0e, 0x5b, 0x11, 0x91, 0xb8, 0x85,
-	0x71, 0x14, 0x53, 0x05, 0x1b, 0xb6, 0x96, 0xd9, 0x8b, 0xe3, 0x11, 0x4e, 0x8c, 0x9d, 0x57, 0x04,
+	0x38, 0x8e, 0x13, 0xaa, 0x60, 0xc3, 0x36, 0x72, 0x7b, 0x71, 0x3c, 0xc6, 0xe9, 0xca, 0xce, 0xcb,
-	0xb0, 0xbb, 0x30, 0xe9, 0xa8, 0x61, 0x8f, 0x0c, 0xc7, 0x44, 0x48, 0xaf, 0x0b, 0x3e, 0xaf, 0x4d,
+	0x45, 0xcc, 0xaf, 0x66, 0xbc, 0x32, 0x80, 0xfd, 0x65, 0x50, 0x4f, 0x09, 0x03, 0x32, 0x9a, 0x10,
-	0x05, 0x67, 0x54, 0x10, 0xf8, 0x17, 0xe4, 0xb5, 0xf8, 0xab, 0x5d, 0xb5, 0xeb, 0x9f, 0x9a, 0x25,
+	0x21, 0xbd, 0x3e, 0x78, 0xb3, 0x75, 0x2b, 0x38, 0xa3, 0x82, 0xc0, 0xaf, 0xa0, 0xa8, 0x03, 0xde,
-	0x3f, 0xeb, 0x5a, 0xbe, 0x56, 0xb5, 0x3f, 0x4c, 0xee, 0x2a, 0x56, 0xcf, 0x28, 0xbc, 0x1d, 0x50,
+	0xd9, 0x75, 0xbb, 0xf9, 0xba, 0x5d, 0xf1, 0xf3, 0x46, 0xf7, 0xb5, 0xaa, 0xfb, 0x62, 0x7a, 0x5d,
-	0x53, 0x96, 0x7b, 0x44, 0x1e, 0x68, 0xae, 0x9d, 0x76, 0xc6, 0xe1, 0x20, 0xee, 0xef, 0x93, 0xd4,
+	0xb3, 0x02, 0xa3, 0xf0, 0x7e, 0x80, 0x86, 0xb2, 0xfc, 0x45, 0xe4, 0x1f, 0xcd, 0x75, 0xb3, 0xde,
-	0xe4, 0xc2, 0x12, 0x28, 0xf0, 0xe7, 0x99, 0xca, 0x28, 0xf4, 0x56, 0x03, 0xef, 0x1b, 0xf0, 0xb6,
+	0x24, 0x1a, 0x26, 0x83, 0xdf, 0x24, 0x33, 0xb9, 0xb0, 0x02, 0x4a, 0x7c, 0x75, 0xa7, 0x32, 0x4a,
-	0x59, 0xe8, 0x92, 0xcd, 0x87, 0x1c, 0xf8, 0xa8, 0x30, 0x78, 0x69, 0x83, 0xbc, 0xee, 0x02, 0xeb,
+	0xc1, 0xe6, 0xc2, 0xfb, 0x07, 0xbc, 0x7d, 0x16, 0xa6, 0x64, 0x07, 0xbc, 0x32, 0x45, 0x4c, 0xcb,
-	0xd9, 0x4d, 0x37, 0xaf, 0xee, 0xfc, 0x78, 0x03, 0xa9, 0x93, 0xbc, 0xef, 0x17, 0x37, 0x8f, 0xd7,
+	0x6a, 0x7e, 0x4b, 0x63, 0x11, 0xac, 0xe8, 0xf6, 0x6d, 0x01, 0xbc, 0x54, 0xfe, 0xf0, 0xcc, 0x06,
-	0xb9, 0x0a, 0x2c, 0xa3, 0x95, 0xe4, 0xd7, 0xc6, 0xa2, 0xe1, 0xd4, 0x06, 0x5f, 0x32, 0x2b, 0xc3,
+	0x45, 0x3d, 0x04, 0x6c, 0xe6, 0x8b, 0x77, 0xdf, 0xcc, 0xf9, 0xf0, 0x04, 0x52, 0x57, 0xf4, 0xde,
-	0xd6, 0x96, 0xac, 0x6d, 0x7b, 0x72, 0xfe, 0xbc, 0x5f, 0x68, 0x3a, 0xef, 0xaa, 0xce, 0xff, 0xe1,
+	0x9f, 0x5e, 0xde, 0x5d, 0x14, 0x6a, 0xb0, 0x8a, 0x36, 0x92, 0x4f, 0x3b, 0x5b, 0x84, 0x33, 0x1b,
-	0xbf, 0x57, 0x3a, 0x47, 0x44, 0x06, 0xe6, 0x1c, 0x84, 0x69, 0xa0, 0x97, 0x1f, 0x1c, 0x93, 0x14,
+	0xbc, 0xcd, 0x9d, 0x15, 0x76, 0xf6, 0x64, 0xed, 0x7b, 0x60, 0xe7, 0xcb, 0xf3, 0x85, 0xa6, 0xf3,
-	0x9d, 0x2d, 0x7f, 0xc4, 0x79, 0xbb, 0x35, 0x99, 0xb9, 0xf6, 0x74, 0xe6, 0xda, 0xf7, 0x33, 0xd7,
+	0x4f, 0xd5, 0xf9, 0x3b, 0xfc, 0xf6, 0x48, 0xe7, 0x98, 0xc8, 0xd0, 0x9c, 0xc3, 0x28, 0x0b, 0xf5,
-	0xbe, 0x9a, 0xbb, 0xd6, 0x74, 0xee, 0x5a, 0xb7, 0x73, 0xd7, 0x3a, 0x2c, 0xaf, 0xdb, 0x9e, 0x2e,
+	0xd6, 0xc2, 0x03, 0x92, 0xa1, 0xe3, 0xf5, 0x06, 0x4f, 0xba, 0x9d, 0xe9, 0xdc, 0xb5, 0x67, 0x73,
-	0x8d, 0x65, 0xca, 0x89, 0x08, 0xf3, 0xea, 0xd5, 0xfd, 0x7e, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x05,
+	0xd7, 0xbe, 0x99, 0xbb, 0xf6, 0xf9, 0xc2, 0xb5, 0x66, 0x0b, 0xd7, 0xba, 0x5a, 0xb8, 0xd6, 0xdf,
-	0xe2, 0x2b, 0xbf, 0x32, 0x03, 0x00, 0x00,
+	0xea, 0xb6, 0xed, 0xd1, 0xda, 0x58, 0x66, 0x9c, 0x88, 0xa8, 0xa8, 0x3e, 0xd7, 0xcf, 0xf7, 0x01,
+	0x00, 0x00, 0xff, 0xff, 0xd2, 0x46, 0x91, 0x7e, 0x8f, 0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -457,6 +466,18 @@ func (m *QueryGetMachineByPublicKeyResponse) MarshalToSizedBuffer(dAtA []byte) (
 	_ = i
 	var l int
 	_ = l
+	if m.Machine != nil {
+		{
+			size, err := m.Machine.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintQuery(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0xa
+	}
 	return len(dAtA) - i, nil
 }
 
@@ -510,6 +531,10 @@ func (m *QueryGetMachineByPublicKeyResponse) Size() (n int) {
 	}
 	var l int
 	_ = l
+	if m.Machine != nil {
+		l = m.Machine.Size()
+		n += 1 + l + sovQuery(uint64(l))
+	}
 	return n
 }
 
@@ -763,6 +788,42 @@ func (m *QueryGetMachineByPublicKeyResponse) Unmarshal(dAtA []byte) error {
 			return fmt.Errorf("proto: QueryGetMachineByPublicKeyResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Machine", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Machine == nil {
+				m.Machine = &Machine{}
+			}
+			if err := m.Machine.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipQuery(dAtA[iNdEx:])