Rename rpc method to reserve authority and resolve type errors

api/cerc/registry/v1/tx_grpc.pb.go

@@ -26,8 +26,8 @@ const (
 	Msg_DissociateRecords_FullMethodName  = "/cerc.registry.v1.Msg/DissociateRecords"
 	Msg_ReassociateRecords_FullMethodName = "/cerc.registry.v1.Msg/ReassociateRecords"
 	Msg_SetName_FullMethodName            = "/cerc.registry.v1.Msg/SetName"
-	Msg_ReserveName_FullMethodName        = "/cerc.registry.v1.Msg/ReserveName"
 	Msg_DeleteName_FullMethodName         = "/cerc.registry.v1.Msg/DeleteName"
+	Msg_ReserveAuthority_FullMethodName   = "/cerc.registry.v1.Msg/ReserveAuthority"
 	Msg_SetAuthorityBond_FullMethodName   = "/cerc.registry.v1.Msg/SetAuthorityBond"
 )
 
@@ -49,10 +49,10 @@ type MsgClient interface {
 	ReassociateRecords(ctx context.Context, in *MsgReassociateRecords, opts ...grpc.CallOption) (*MsgReassociateRecordsResponse, error)
 	// SetName will store the name with given lrn and name
 	SetName(ctx context.Context, in *MsgSetName, opts ...grpc.CallOption) (*MsgSetNameResponse, error)
-	// Reserve name
-	ReserveName(ctx context.Context, in *MsgReserveAuthority, opts ...grpc.CallOption) (*MsgReserveAuthorityResponse, error)
 	// Delete Name method will remove authority name
-	DeleteName(ctx context.Context, in *MsgDeleteNameAuthority, opts ...grpc.CallOption) (*MsgDeleteNameAuthorityResponse, error)
+	DeleteName(ctx context.Context, in *MsgDeleteName, opts ...grpc.CallOption) (*MsgDeleteNameResponse, error)
+	// Reserve authority name
+	ReserveAuthority(ctx context.Context, in *MsgReserveAuthority, opts ...grpc.CallOption) (*MsgReserveAuthorityResponse, error)
 	// SetAuthorityBond
 	SetAuthorityBond(ctx context.Context, in *MsgSetAuthorityBond, opts ...grpc.CallOption) (*MsgSetAuthorityBondResponse, error)
 }
@@ -128,18 +128,18 @@ func (c *msgClient) SetName(ctx context.Context, in *MsgSetName, opts ...grpc.Ca
 	return out, nil
 }
 
-func (c *msgClient) ReserveName(ctx context.Context, in *MsgReserveAuthority, opts ...grpc.CallOption) (*MsgReserveAuthorityResponse, error) {
-	out := new(MsgReserveAuthorityResponse)
-	err := c.cc.Invoke(ctx, Msg_ReserveName_FullMethodName, in, out, opts...)
+func (c *msgClient) DeleteName(ctx context.Context, in *MsgDeleteName, opts ...grpc.CallOption) (*MsgDeleteNameResponse, error) {
+	out := new(MsgDeleteNameResponse)
+	err := c.cc.Invoke(ctx, Msg_DeleteName_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgClient) DeleteName(ctx context.Context, in *MsgDeleteNameAuthority, opts ...grpc.CallOption) (*MsgDeleteNameAuthorityResponse, error) {
-	out := new(MsgDeleteNameAuthorityResponse)
-	err := c.cc.Invoke(ctx, Msg_DeleteName_FullMethodName, in, out, opts...)
+func (c *msgClient) ReserveAuthority(ctx context.Context, in *MsgReserveAuthority, opts ...grpc.CallOption) (*MsgReserveAuthorityResponse, error) {
+	out := new(MsgReserveAuthorityResponse)
+	err := c.cc.Invoke(ctx, Msg_ReserveAuthority_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -173,10 +173,10 @@ type MsgServer interface {
 	ReassociateRecords(context.Context, *MsgReassociateRecords) (*MsgReassociateRecordsResponse, error)
 	// SetName will store the name with given lrn and name
 	SetName(context.Context, *MsgSetName) (*MsgSetNameResponse, error)
-	// Reserve name
-	ReserveName(context.Context, *MsgReserveAuthority) (*MsgReserveAuthorityResponse, error)
 	// Delete Name method will remove authority name
-	DeleteName(context.Context, *MsgDeleteNameAuthority) (*MsgDeleteNameAuthorityResponse, error)
+	DeleteName(context.Context, *MsgDeleteName) (*MsgDeleteNameResponse, error)
+	// Reserve authority name
+	ReserveAuthority(context.Context, *MsgReserveAuthority) (*MsgReserveAuthorityResponse, error)
 	// SetAuthorityBond
 	SetAuthorityBond(context.Context, *MsgSetAuthorityBond) (*MsgSetAuthorityBondResponse, error)
 	mustEmbedUnimplementedMsgServer()
@@ -207,12 +207,12 @@ func (UnimplementedMsgServer) ReassociateRecords(context.Context, *MsgReassociat
 func (UnimplementedMsgServer) SetName(context.Context, *MsgSetName) (*MsgSetNameResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetName not implemented")
 }
-func (UnimplementedMsgServer) ReserveName(context.Context, *MsgReserveAuthority) (*MsgReserveAuthorityResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ReserveName not implemented")
-}
-func (UnimplementedMsgServer) DeleteName(context.Context, *MsgDeleteNameAuthority) (*MsgDeleteNameAuthorityResponse, error) {
+func (UnimplementedMsgServer) DeleteName(context.Context, *MsgDeleteName) (*MsgDeleteNameResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteName not implemented")
 }
+func (UnimplementedMsgServer) ReserveAuthority(context.Context, *MsgReserveAuthority) (*MsgReserveAuthorityResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ReserveAuthority not implemented")
+}
 func (UnimplementedMsgServer) SetAuthorityBond(context.Context, *MsgSetAuthorityBond) (*MsgSetAuthorityBondResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetAuthorityBond not implemented")
 }
@@ -355,26 +355,8 @@ func _Msg_SetName_Handler(srv interface{}, ctx context.Context, dec func(interfa
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Msg_ReserveName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgReserveAuthority)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MsgServer).ReserveName(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: Msg_ReserveName_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServer).ReserveName(ctx, req.(*MsgReserveAuthority))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Msg_DeleteName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgDeleteNameAuthority)
+	in := new(MsgDeleteName)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -386,7 +368,25 @@ func _Msg_DeleteName_Handler(srv interface{}, ctx context.Context, dec func(inte
 		FullMethod: Msg_DeleteName_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServer).DeleteName(ctx, req.(*MsgDeleteNameAuthority))
+		return srv.(MsgServer).DeleteName(ctx, req.(*MsgDeleteName))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Msg_ReserveAuthority_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgReserveAuthority)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).ReserveAuthority(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Msg_ReserveAuthority_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).ReserveAuthority(ctx, req.(*MsgReserveAuthority))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -444,14 +444,14 @@ var Msg_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "SetName",
 			Handler:    _Msg_SetName_Handler,
 		},
-		{
-			MethodName: "ReserveName",
-			Handler:    _Msg_ReserveName_Handler,
-		},
 		{
 			MethodName: "DeleteName",
 			Handler:    _Msg_DeleteName_Handler,
 		},
+		{
+			MethodName: "ReserveAuthority",
+			Handler:    _Msg_ReserveAuthority_Handler,
+		},
 		{
 			MethodName: "SetAuthorityBond",
 			Handler:    _Msg_SetAuthorityBond_Handler,

gql/resolver.go

@@ -51,11 +51,11 @@ func (q queryResolver) LookupAuthorities(ctx context.Context, names []string) ([
 		}
 
 		if nameAuthority.AuctionId != "" {
-			auctionResp, err := auctionQueryClient.GetAuction(context.Background(), &auctiontypes.QueryAuctionRequest{Id: nameAuthority.GetAuctionId()})
+			auctionResp, err := auctionQueryClient.GetAuction(context.Background(), &auctiontypes.QueryGetAuctionRequest{Id: nameAuthority.GetAuctionId()})
 			if err != nil {
 				return nil, err
 			}
-			bidsResp, err := auctionQueryClient.GetBids(context.Background(), &auctiontypes.QueryBidsRequest{AuctionId: nameAuthority.GetAuctionId()})
+			bidsResp, err := auctionQueryClient.GetBids(context.Background(), &auctiontypes.QueryGetBidsRequest{AuctionId: nameAuthority.GetAuctionId()})
 			if err != nil {
 				return nil, err
 			}
@@ -150,7 +150,7 @@ func (q queryResolver) GetRecordsByIds(ctx context.Context, ids []string) ([]*Re
 	gqlResponse := make([]*Record, len(ids))
 
 	for i, id := range ids {
-		res, err := nsQueryClient.GetRecord(context.Background(), &registrytypes.QueryRecordByIdRequest{Id: id})
+		res, err := nsQueryClient.GetRecord(context.Background(), &registrytypes.QueryGetRecordRequest{Id: id})
 		if err != nil {
 			// Return nil for record not found.
 			gqlResponse[i] = nil
@@ -275,7 +275,7 @@ func (q *queryResolver) GetBond(ctx context.Context, id string) (*Bond, error) {
 
 func (q queryResolver) QueryBonds(ctx context.Context, attributes []*KeyValueInput) ([]*Bond, error) {
 	bondQueryClient := bondtypes.NewQueryClient(q.ctx)
-	bonds, err := bondQueryClient.Bonds(context.Background(), &bondtypes.QueryGetBondsRequest{})
+	bonds, err := bondQueryClient.Bonds(context.Background(), &bondtypes.QueryBondsRequest{})
 	if err != nil {
 		return nil, err
 	}
@@ -330,11 +330,11 @@ func (q queryResolver) GetAuctionsByIds(ctx context.Context, ids []string) ([]*A
 	auctionQueryClient := auctiontypes.NewQueryClient(q.ctx)
 	gqlAuctionResponse := make([]*Auction, len(ids))
 	for i, id := range ids {
-		auctionObj, err := auctionQueryClient.GetAuction(context.Background(), &auctiontypes.QueryAuctionRequest{Id: id})
+		auctionObj, err := auctionQueryClient.GetAuction(context.Background(), &auctiontypes.QueryGetAuctionRequest{Id: id})
 		if err != nil {
 			return nil, err
 		}
-		bidsObj, err := auctionQueryClient.GetBids(context.Background(), &auctiontypes.QueryBidsRequest{AuctionId: id})
+		bidsObj, err := auctionQueryClient.GetBids(context.Background(), &auctiontypes.QueryGetBidsRequest{AuctionId: id})
 		if err != nil {
 			return nil, err
 		}

proto/cerc/registry/v1/tx.proto

@@ -50,15 +50,15 @@ service Msg {
     option (google.api.http).post = "/cerc/registry/v1/set_name";
   }
 
-  // Reserve name
-  rpc ReserveName(MsgReserveAuthority) returns (MsgReserveAuthorityResponse) {
-    option (google.api.http).post = "/cerc/registry/v1/reserve_name";
+  // Delete Name method will remove authority name
+  rpc DeleteName(MsgDeleteName) returns (MsgDeleteNameResponse) {
+    option (google.api.http).post = "/cerc/registry/v1/delete_name";
   }
 
-  // Delete Name method will remove authority name
-  rpc DeleteName(MsgDeleteNameAuthority)
-      returns (MsgDeleteNameAuthorityResponse) {
-    option (google.api.http).post = "/cerc/registry/v1/delete_name";
+  // Reserve authority name
+  rpc ReserveAuthority(MsgReserveAuthority)
+      returns (MsgReserveAuthorityResponse) {
+    option (google.api.http).post = "/cerc/registry/v1/reserve_authority";
   }
 
   // SetAuthorityBond
@@ -102,7 +102,7 @@ message MsgSetName {
 // MsgSetNameResponse
 message MsgSetNameResponse {}
 
-// MsgReserveName
+// MsgReserveAuthority
 message MsgReserveAuthority {
   option (cosmos.msg.v1.signer) = "signer";
 
@@ -113,7 +113,7 @@ message MsgReserveAuthority {
   string owner = 3;
 }
 
-// MsgReserveNameResponse
+// MsgReserveAuthorityResponse
 message MsgReserveAuthorityResponse {}
 
 // MsgSetAuthorityBond
@@ -129,16 +129,16 @@ message MsgSetAuthorityBond {
 // MsgSetAuthorityBondResponse
 message MsgSetAuthorityBondResponse {}
 
-// MsgDeleteNameAuthority
-message MsgDeleteNameAuthority {
+// MsgDeleteName
+message MsgDeleteName {
   option (cosmos.msg.v1.signer) = "signer";
 
   string lrn = 1;
   string signer = 2;
 }
 
-// MsgDeleteNameAuthorityResponse
-message MsgDeleteNameAuthorityResponse {}
+// MsgDeleteNameResponse
+message MsgDeleteNameResponse {}
 
 // MsgRenewRecord
 message MsgRenewRecord {

tests/e2e/auction/grpc.go

@@ -106,7 +106,7 @@ func (ets *E2ETestSuite) TestGetAuctionGrpc() {
 				sr.Contains(string(resp), tc.errorMsg)
 			} else {
 				sr.NoError(err)
-				var auction auctiontypes.QueryAuctionResponse
+				var auction auctiontypes.QueryGetAuctionResponse
 				err = val.ClientCtx.Codec.UnmarshalJSON(resp, &auction)
 				sr.NoError(err)
 				sr.Equal(auctionId, auction.Auction.Id)
@@ -151,7 +151,7 @@ func (ets *E2ETestSuite) TestGetBidsGrpc() {
 				sr.Contains(string(resp), tc.errorMsg)
 			} else {
 				sr.NoError(err)
-				var bids auctiontypes.QueryBidsResponse
+				var bids auctiontypes.QueryGetBidsResponse
 				err = val.ClientCtx.Codec.UnmarshalJSON(resp, &bids)
 				sr.NoError(err)
 				sr.Equal(auctionId, bids.Bids[0].AuctionId)
@@ -196,7 +196,7 @@ func (ets *E2ETestSuite) TestGetBidGrpc() {
 				sr.Contains(string(resp), tc.errorMsg)
 			} else {
 				sr.NoError(err)
-				var bid auctiontypes.QueryBidResponse
+				var bid auctiontypes.QueryGetBidResponse
 				err = val.ClientCtx.Codec.UnmarshalJSON(resp, &bid)
 				sr.NoError(err)
 			}

tests/e2e/bond/grpc.go

@@ -58,7 +58,7 @@ func (ets *E2ETestSuite) TestGRPCGetBonds() {
 			if tc.expErr {
 				sr.Contains(string(resp), tc.errorMsg)
 			} else {
-				var response bondtypes.QueryGetBondsResponse
+				var response bondtypes.QueryBondsResponse
 				err := val.ClientCtx.Codec.UnmarshalJSON(resp, &response)
 				sr.NoError(err)
 				sr.NotZero(len(response.GetBonds()))

tests/e2e/bond/query.go

@@ -40,7 +40,7 @@ func (ets *E2ETestSuite) TestGetQueryBondList() {
 			cmd := cli.GetQueryBondList()
 			out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, tc.args)
 			sr.NoError(err)
-			var queryResponse bondtypes.QueryGetBondsResponse
+			var queryResponse bondtypes.QueryBondsResponse
 			err = clientCtx.Codec.UnmarshalJSON(out.Bytes(), &queryResponse)
 			sr.NoError(err)
 			sr.NotZero(len(queryResponse.GetBonds()))

tests/e2e/bond/suite.go

@@ -113,7 +113,7 @@ func (ets *E2ETestSuite) createBond() string {
 	}
 	out, err = clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
 	sr.NoError(err)
-	var queryResponse bondtypes.QueryGetBondsResponse
+	var queryResponse bondtypes.QueryBondsResponse
 	err = val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &queryResponse)
 	sr.NoError(err)
 

tests/e2e/registry/grpc.go

@@ -263,7 +263,7 @@ func (ets *E2ETestSuite) TestGRPCQueryGetRecordById() {
 			if tc.expectErr {
 				require.Contains(string(resp), tc.errorMsg)
 			} else {
-				var response registrytypes.QueryRecordByIdResponse
+				var response registrytypes.QueryGetRecordResponse
 				err := val.ClientCtx.Codec.UnmarshalJSON(resp, &response)
 				sr.NoError(err)
 				record := response.GetRecord()
@@ -317,7 +317,7 @@ func (ets *E2ETestSuite) TestGRPCQueryGetRecordByBondId() {
 			if tc.expectErr {
 				require.Contains(string(resp), tc.errorMsg)
 			} else {
-				var response registrytypes.QueryRecordsByBondIdResponse
+				var response registrytypes.QueryGetRecordsByBondIdResponse
 				err := val.ClientCtx.Codec.UnmarshalJSON(resp, &response)
 				sr.NoError(err)
 				records := response.GetRecords()

tests/e2e/registry/suite.go

@@ -132,7 +132,7 @@ func (ets *E2ETestSuite) createBond() string {
 	}
 	out, err = clitestutil.ExecTestCLICmd(clientCtx, cmd, args)
 	sr.NoError(err)
-	var queryResponse bondtypes.QueryGetBondsResponse
+	var queryResponse bondtypes.QueryBondsResponse
 	err = val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &queryResponse)
 	sr.NoError(err)
 
@@ -146,7 +146,7 @@ func (ets *E2ETestSuite) reserveName(authorityName string) {
 	sr := ets.Require()
 
 	clientCtx := val.ClientCtx
-	cmd := cli.GetCmdReserveName()
+	cmd := cli.GetCmdReserveAuthority()
 	args := []string{
 		authorityName,
 		fmt.Sprintf("--owner=%s", ets.accountAddress),
@@ -174,7 +174,7 @@ func (ets *E2ETestSuite) createNameRecord(authorityName string) {
 
 	// reserving the name
 	clientCtx := val.ClientCtx
-	cmd := cli.GetCmdReserveName()
+	cmd := cli.GetCmdReserveAuthority()
 	args := []string{
 		authorityName,
 		fmt.Sprintf("--owner=%s", ets.accountAddress),

tests/integration/auction/keeper/query_server_test.go

@@ -35,17 +35,17 @@ func (kts *KeeperTestSuite) TestGrpcQueryParams() {
 func (kts *KeeperTestSuite) TestGrpcGetAuction() {
 	testCases := []struct {
 		msg           string
-		req           *types.QueryAuctionRequest
+		req           *types.QueryGetAuctionRequest
 		createAuction bool
 	}{
 		{
 			"fetch auction with empty auction ID",
-			&types.QueryAuctionRequest{},
+			&types.QueryGetAuctionRequest{},
 			false,
 		},
 		{
 			"fetch auction with valid auction ID",
-			&types.QueryAuctionRequest{},
+			&types.QueryGetAuctionRequest{},
 			true,
 		},
 	}
@@ -111,28 +111,28 @@ func (kts *KeeperTestSuite) TestGrpcGetAllAuctions() {
 func (kts *KeeperTestSuite) TestGrpcGetBids() {
 	testCases := []struct {
 		msg           string
-		req           *types.QueryBidsRequest
+		req           *types.QueryGetBidsRequest
 		createAuction bool
 		commitBid     bool
 		bidCount      int
 	}{
 		{
 			"fetch all bids when no auction exists",
-			&types.QueryBidsRequest{},
+			&types.QueryGetBidsRequest{},
 			false,
 			false,
 			0,
 		},
 		{
 			"fetch all bids for valid auction but no added bids",
-			&types.QueryBidsRequest{},
+			&types.QueryGetBidsRequest{},
 			true,
 			false,
 			0,
 		},
 		{
 			"fetch all bids for valid auction and valid bid",
-			&types.QueryBidsRequest{},
+			&types.QueryGetBidsRequest{},
 			true,
 			true,
 			1,
@@ -162,17 +162,17 @@ func (kts *KeeperTestSuite) TestGrpcGetBids() {
 func (kts *KeeperTestSuite) TestGrpcGetBid() {
 	testCases := []struct {
 		msg                 string
-		req                 *types.QueryBidRequest
+		req                 *types.QueryGetBidRequest
 		createAuctionAndBid bool
 	}{
 		{
 			"fetch bid when bid does not exist",
-			&types.QueryBidRequest{},
+			&types.QueryGetBidRequest{},
 			false,
 		},
 		{
 			"fetch bid when valid bid exists",
-			&types.QueryBidRequest{},
+			&types.QueryGetBidRequest{},
 			true,
 		},
 	}

tests/integration/bond/keeper/query_server_test.go

@@ -34,22 +34,22 @@ func (kts *KeeperTestSuite) TestGrpcQueryParams() {
 func (kts *KeeperTestSuite) TestGrpcQueryBondsList() {
 	testCases := []struct {
 		msg         string
-		req         *types.QueryGetBondsRequest
-		resp        *types.QueryGetBondsResponse
+		req         *types.QueryBondsRequest
+		resp        *types.QueryBondsResponse
 		noOfBonds   int
 		createBonds bool
 	}{
 		{
 			"empty request",
-			&types.QueryGetBondsRequest{},
-			&types.QueryGetBondsResponse{},
+			&types.QueryBondsRequest{},
+			&types.QueryBondsResponse{},
 			0,
 			false,
 		},
 		{
 			"Get Bonds",
-			&types.QueryGetBondsRequest{},
-			&types.QueryGetBondsResponse{},
+			&types.QueryBondsRequest{},
+			&types.QueryBondsResponse{},
 			1,
 			true,
 		},
@@ -181,7 +181,7 @@ func (kts *KeeperTestSuite) TestGrpcGetModuleBalance() {
 				_, err := kts.createBond()
 				kts.Require().NoError(err)
 			}
-			resp, err := kts.queryClient.GetBondsModuleBalance(context.Background(), test.req)
+			resp, err := kts.queryClient.GetBondModuleBalance(context.Background(), test.req)
 			if !test.errResponse {
 				kts.Require().Nil(err)
 				kts.Require().NotNil(resp.GetBalance())

tests/integration/registry/keeper/query_server_test.go

@@ -228,21 +228,21 @@ func (kts *KeeperTestSuite) TestGrpcGetRecordLists() {
 	// Get the records by record id
 	testCases1 := []struct {
 		msg          string
-		req          *types.QueryRecordByIdRequest
+		req          *types.QueryGetRecordRequest
 		createRecord bool
 		expErr       bool
 		noOfRecords  int
 	}{
 		{
 			"Invalid Request without record id",
-			&types.QueryRecordByIdRequest{},
+			&types.QueryGetRecordRequest{},
 			false,
 			true,
 			0,
 		},
 		{
 			"With Record ID",
-			&types.QueryRecordByIdRequest{
+			&types.QueryGetRecordRequest{
 				Id: recordId,
 			},
 			true,
@@ -270,21 +270,21 @@ func (kts *KeeperTestSuite) TestGrpcGetRecordLists() {
 	// Get the records by record id
 	testCasesByBondId := []struct {
 		msg          string
-		req          *types.QueryRecordsByBondIdRequest
+		req          *types.QueryGetRecordsByBondIdRequest
 		createRecord bool
 		expErr       bool
 		noOfRecords  int
 	}{
 		{
 			"Invalid Request without bond id",
-			&types.QueryRecordsByBondIdRequest{},
+			&types.QueryGetRecordsByBondIdRequest{},
 			false,
 			true,
 			0,
 		},
 		{
 			"With Bond ID",
-			&types.QueryRecordsByBondIdRequest{
+			&types.QueryGetRecordsByBondIdRequest{
 				Id: kts.bond.GetId(),
 			},
 			true,

x/auction/keeper/query_server.go

@@ -46,7 +46,7 @@ func (qs queryServer) Auctions(c context.Context, req *auctiontypes.QueryAuction
 }
 
 // GetAuction queries an auction by id
-func (qs queryServer) GetAuction(c context.Context, req *auctiontypes.QueryAuctionRequest) (*auctiontypes.QueryAuctionResponse, error) {
+func (qs queryServer) GetAuction(c context.Context, req *auctiontypes.QueryGetAuctionRequest) (*auctiontypes.QueryGetAuctionResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 
 	if req.Id == "" {
@@ -58,11 +58,11 @@ func (qs queryServer) GetAuction(c context.Context, req *auctiontypes.QueryAucti
 		return nil, err
 	}
 
-	return &auctiontypes.QueryAuctionResponse{Auction: &auction}, nil
+	return &auctiontypes.QueryGetAuctionResponse{Auction: &auction}, nil
 }
 
 // GetBid queries an auction bid by auction-id and bidder
-func (qs queryServer) GetBid(c context.Context, req *auctiontypes.QueryBidRequest) (*auctiontypes.QueryBidResponse, error) {
+func (qs queryServer) GetBid(c context.Context, req *auctiontypes.QueryGetBidRequest) (*auctiontypes.QueryGetBidResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 
 	if req.AuctionId == "" {
@@ -78,11 +78,11 @@ func (qs queryServer) GetBid(c context.Context, req *auctiontypes.QueryBidReques
 		return nil, err
 	}
 
-	return &auctiontypes.QueryBidResponse{Bid: &bid}, nil
+	return &auctiontypes.QueryGetBidResponse{Bid: &bid}, nil
 }
 
 // GetBids queries all auction bids
-func (qs queryServer) GetBids(c context.Context, req *auctiontypes.QueryBidsRequest) (*auctiontypes.QueryBidsResponse, error) {
+func (qs queryServer) GetBids(c context.Context, req *auctiontypes.QueryGetBidsRequest) (*auctiontypes.QueryGetBidsResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 
 	if req.AuctionId == "" {
@@ -94,7 +94,7 @@ func (qs queryServer) GetBids(c context.Context, req *auctiontypes.QueryBidsRequ
 		return nil, err
 	}
 
-	return &auctiontypes.QueryBidsResponse{Bids: bids}, nil
+	return &auctiontypes.QueryGetBidsResponse{Bids: bids}, nil
 }
 
 // AuctionsByBidder queries auctions by bidder

x/bond/client/cli/query.go

@@ -33,7 +33,7 @@ $ %s query %s list
 				return err
 			}
 			queryClient := bondtypes.NewQueryClient(clientCtx)
-			res, err := queryClient.Bonds(cmd.Context(), &bondtypes.QueryGetBondsRequest{})
+			res, err := queryClient.Bonds(cmd.Context(), &bondtypes.QueryBondsRequest{})
 			if err != nil {
 				return err
 			}

x/bond/keeper/query_server.go

@@ -34,7 +34,7 @@ func (qs queryServer) Params(c context.Context, _ *bondtypes.QueryParamsRequest)
 }
 
 // Bonds implements bond.QueryServer.
-func (qs queryServer) Bonds(c context.Context, _ *bondtypes.QueryGetBondsRequest) (*bondtypes.QueryGetBondsResponse, error) {
+func (qs queryServer) Bonds(c context.Context, _ *bondtypes.QueryBondsRequest) (*bondtypes.QueryBondsResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 
 	resp, err := qs.k.ListBonds(ctx)
@@ -42,7 +42,7 @@ func (qs queryServer) Bonds(c context.Context, _ *bondtypes.QueryGetBondsRequest
 		return nil, err
 	}
 
-	return &bondtypes.QueryGetBondsResponse{Bonds: resp}, nil
+	return &bondtypes.QueryBondsResponse{Bonds: resp}, nil
 }
 
 // GetBondById implements bond.QueryServer.
@@ -79,8 +79,8 @@ func (qs queryServer) GetBondsByOwner(c context.Context, req *bondtypes.QueryGet
 	return &bondtypes.QueryGetBondsByOwnerResponse{Bonds: bonds}, nil
 }
 
-// GetBondsModuleBalance implements bond.QueryServer.
-func (qs queryServer) GetBondsModuleBalance(c context.Context, _ *bondtypes.QueryGetBondModuleBalanceRequest) (*bondtypes.QueryGetBondModuleBalanceResponse, error) {
+// GetBondModuleBalance implements bond.QueryServer.
+func (qs queryServer) GetBondModuleBalance(c context.Context, _ *bondtypes.QueryGetBondModuleBalanceRequest) (*bondtypes.QueryGetBondModuleBalanceResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 	balances := qs.k.GetBondModuleBalances(ctx)
 

x/bond/module/autocli.go

@@ -44,7 +44,7 @@ func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions {
 					},
 				},
 				{
-					RpcMethod:      "GetBondsModuleBalance",
+					RpcMethod:      "GetBondModuleBalance",
 					Use:            "balance",
 					Short:          "Get bond module account balances",
 					PositionalArgs: []*autocliv1.PositionalArgDescriptor{},

x/registry/client/cli/tx.go

@@ -85,8 +85,8 @@ func GetPayloadFromFile(filePath string) (*registrytypes.ReadablePayload, error)
 	return &payload, nil
 }
 
-// GetCmdReserveName is the CLI command for reserving a name.
-func GetCmdReserveName() *cobra.Command {
+// GetCmdReserveAuthority is the CLI command for reserving a name.
+func GetCmdReserveAuthority() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "reserve-name [name]",
 		Short: "Reserve name.",

x/registry/codec.go

@@ -10,7 +10,7 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
 	registry.RegisterImplementations((*sdk.Msg)(nil),
 		&MsgSetName{},
 		&MsgReserveAuthority{},
-		&MsgDeleteNameAuthority{},
+		&MsgDeleteName{},
 		&MsgSetAuthorityBond{},
 
 		&MsgSetRecord{},

x/registry/events.go

@@ -1,15 +1,15 @@
 package registry
 
 const (
-	EventTypeSetRecord            = "set"
-	EventTypeDeleteName           = "delete-name"
-	EventTypeReserveNameAuthority = "reserve-authority"
-	EventTypeAuthorityBond        = "authority-bond"
-	EventTypeRenewRecord          = "renew-record"
-	EventTypeAssociateBond        = "associate-bond"
-	EventTypeDissociateBond       = "dissociate-bond"
-	EventTypeDissociateRecords    = "dissociate-record"
-	EventTypeReassociateRecords   = "re-associate-records"
+	EventTypeSetRecord          = "set"
+	EventTypeDeleteName         = "delete-name"
+	EventTypeReserveAuthority   = "reserve-authority"
+	EventTypeAuthorityBond      = "authority-bond"
+	EventTypeRenewRecord        = "renew-record"
+	EventTypeAssociateBond      = "associate-bond"
+	EventTypeDissociateBond     = "dissociate-bond"
+	EventTypeDissociateRecords  = "dissociate-record"
+	EventTypeReassociateRecords = "re-associate-records"
 
 	AttributeKeySigner     = "signer"
 	AttributeKeyOwner      = "owner"

x/registry/keeper/msg_server.go

@@ -87,7 +87,7 @@ func (ms msgServer) SetName(c context.Context, msg *registrytypes.MsgSetName) (*
 	return &registrytypes.MsgSetNameResponse{}, nil
 }
 
-func (ms msgServer) ReserveName(c context.Context, msg *registrytypes.MsgReserveAuthority) (*registrytypes.MsgReserveAuthorityResponse, error) {
+func (ms msgServer) ReserveAuthority(c context.Context, msg *registrytypes.MsgReserveAuthority) (*registrytypes.MsgReserveAuthorityResponse, error) {
 	if err := msg.ValidateBasic(); err != nil {
 		return nil, err
 	}
@@ -110,7 +110,7 @@ func (ms msgServer) ReserveName(c context.Context, msg *registrytypes.MsgReserve
 
 	ctx.EventManager().EmitEvents(sdk.Events{
 		sdk.NewEvent(
-			registrytypes.EventTypeReserveNameAuthority,
+			registrytypes.EventTypeReserveAuthority,
 			sdk.NewAttribute(registrytypes.AttributeKeySigner, msg.Signer),
 			sdk.NewAttribute(registrytypes.AttributeKeyName, msg.Name),
 			sdk.NewAttribute(registrytypes.AttributeKeyOwner, msg.Owner),
@@ -159,7 +159,7 @@ func (ms msgServer) SetAuthorityBond(c context.Context, msg *registrytypes.MsgSe
 	return &registrytypes.MsgSetAuthorityBondResponse{}, nil
 }
 
-func (ms msgServer) DeleteName(c context.Context, msg *registrytypes.MsgDeleteNameAuthority) (*registrytypes.MsgDeleteNameAuthorityResponse, error) {
+func (ms msgServer) DeleteName(c context.Context, msg *registrytypes.MsgDeleteName) (*registrytypes.MsgDeleteNameResponse, error) {
 	if err := msg.ValidateBasic(); err != nil {
 		return nil, err
 	}
@@ -188,7 +188,7 @@ func (ms msgServer) DeleteName(c context.Context, msg *registrytypes.MsgDeleteNa
 			sdk.NewAttribute(registrytypes.AttributeKeySigner, msg.Signer),
 		),
 	})
-	return &registrytypes.MsgDeleteNameAuthorityResponse{}, nil
+	return &registrytypes.MsgDeleteNameResponse{}, nil
 }
 
 func (ms msgServer) RenewRecord(c context.Context, msg *registrytypes.MsgRenewRecord) (*registrytypes.MsgRenewRecordResponse, error) {

x/registry/keeper/naming_keeper.go

@@ -353,7 +353,7 @@ func (k Keeper) SetAuthorityBond(ctx sdk.Context, msg registrytypes.MsgSetAuthor
 }
 
 // DeleteName removes a LRN -> Record ID mapping.
-func (k Keeper) DeleteName(ctx sdk.Context, msg registrytypes.MsgDeleteNameAuthority) error {
+func (k Keeper) DeleteName(ctx sdk.Context, msg registrytypes.MsgDeleteName) error {
 	signerAddress, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return err

x/registry/keeper/query_server.go

@@ -55,7 +55,7 @@ func (qs queryServer) Records(c context.Context, req *registrytypes.QueryRecords
 	return &registrytypes.QueryRecordsResponse{Records: records}, nil
 }
 
-func (qs queryServer) GetRecord(c context.Context, req *registrytypes.QueryRecordByIdRequest) (*registrytypes.QueryRecordByIdResponse, error) {
+func (qs queryServer) GetRecord(c context.Context, req *registrytypes.QueryGetRecordRequest) (*registrytypes.QueryGetRecordResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 	id := req.GetId()
 
@@ -72,10 +72,10 @@ func (qs queryServer) GetRecord(c context.Context, req *registrytypes.QueryRecor
 		return nil, err
 	}
 
-	return &registrytypes.QueryRecordByIdResponse{Record: record}, nil
+	return &registrytypes.QueryGetRecordResponse{Record: record}, nil
 }
 
-func (qs queryServer) GetRecordsByBondId(c context.Context, req *registrytypes.QueryRecordsByBondIdRequest) (*registrytypes.QueryRecordsByBondIdResponse, error) {
+func (qs queryServer) GetRecordsByBondId(c context.Context, req *registrytypes.QueryGetRecordsByBondIdRequest) (*registrytypes.QueryGetRecordsByBondIdResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 
 	records, err := qs.k.GetRecordsByBondId(ctx, req.GetId())
@@ -83,7 +83,7 @@ func (qs queryServer) GetRecordsByBondId(c context.Context, req *registrytypes.Q
 		return nil, err
 	}
 
-	return &registrytypes.QueryRecordsByBondIdResponse{Records: records}, nil
+	return &registrytypes.QueryGetRecordsByBondIdResponse{Records: records}, nil
 }
 
 func (qs queryServer) GetRegistryModuleBalance(c context.Context,

x/registry/module/autocli.go

@@ -93,9 +93,9 @@ func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions {
 					},
 				},
 				{
-					RpcMethod: "ReserveName",
-					Use:       "reserve-name [name] [owner]",
-					Short:     "Reserve name",
+					RpcMethod: "ReserveAuthority",
+					Use:       "reserve-authority [name] [owner]",
+					Short:     "Reserve authority name",
 					PositionalArgs: []*autocliv1.PositionalArgDescriptor{
 						{ProtoField: "name"},
 						{ProtoField: "owner"},

x/registry/msgs.go

@@ -121,7 +121,7 @@ func (msg MsgSetName) ValidateBasic() error {
 	return nil
 }
 
-func (msg MsgDeleteNameAuthority) ValidateBasic() error {
+func (msg MsgDeleteName) ValidateBasic() error {
 	if len(msg.Lrn) == 0 {
 		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "lrn is required.")
 	}

x/registry/tx.pb.go

@@ -287,7 +287,7 @@ func (m *MsgSetNameResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgSetNameResponse proto.InternalMessageInfo
 
-// MsgReserveName
+// MsgReserveAuthority
 type MsgReserveAuthority struct {
 	Name   string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	Signer string `protobuf:"bytes,2,opt,name=signer,proto3" json:"signer,omitempty"`
@@ -349,7 +349,7 @@ func (m *MsgReserveAuthority) GetOwner() string {
 	return ""
 }
 
-// MsgReserveNameResponse
+// MsgReserveAuthorityResponse
 type MsgReserveAuthorityResponse struct {
 }
 
@@ -484,24 +484,24 @@ func (m *MsgSetAuthorityBondResponse) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgSetAuthorityBondResponse proto.InternalMessageInfo
 
-// MsgDeleteNameAuthority
-type MsgDeleteNameAuthority struct {
+// MsgDeleteName
+type MsgDeleteName struct {
 	Lrn    string `protobuf:"bytes,1,opt,name=lrn,proto3" json:"lrn,omitempty"`
 	Signer string `protobuf:"bytes,2,opt,name=signer,proto3" json:"signer,omitempty"`
 }
 
-func (m *MsgDeleteNameAuthority) Reset()         { *m = MsgDeleteNameAuthority{} }
-func (m *MsgDeleteNameAuthority) String() string { return proto.CompactTextString(m) }
-func (*MsgDeleteNameAuthority) ProtoMessage()    {}
-func (*MsgDeleteNameAuthority) Descriptor() ([]byte, []int) {
+func (m *MsgDeleteName) Reset()         { *m = MsgDeleteName{} }
+func (m *MsgDeleteName) String() string { return proto.CompactTextString(m) }
+func (*MsgDeleteName) ProtoMessage()    {}
+func (*MsgDeleteName) Descriptor() ([]byte, []int) {
 	return fileDescriptor_3c6eb2e5a4d8fa03, []int{9}
 }
-func (m *MsgDeleteNameAuthority) XXX_Unmarshal(b []byte) error {
+func (m *MsgDeleteName) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgDeleteNameAuthority) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgDeleteName) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgDeleteNameAuthority.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgDeleteName.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -511,48 +511,48 @@ func (m *MsgDeleteNameAuthority) XXX_Marshal(b []byte, deterministic bool) ([]by
 		return b[:n], nil
 	}
 }
-func (m *MsgDeleteNameAuthority) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgDeleteNameAuthority.Merge(m, src)
+func (m *MsgDeleteName) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgDeleteName.Merge(m, src)
 }
-func (m *MsgDeleteNameAuthority) XXX_Size() int {
+func (m *MsgDeleteName) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgDeleteNameAuthority) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgDeleteNameAuthority.DiscardUnknown(m)
+func (m *MsgDeleteName) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgDeleteName.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgDeleteNameAuthority proto.InternalMessageInfo
+var xxx_messageInfo_MsgDeleteName proto.InternalMessageInfo
 
-func (m *MsgDeleteNameAuthority) GetLrn() string {
+func (m *MsgDeleteName) GetLrn() string {
 	if m != nil {
 		return m.Lrn
 	}
 	return ""
 }
 
-func (m *MsgDeleteNameAuthority) GetSigner() string {
+func (m *MsgDeleteName) GetSigner() string {
 	if m != nil {
 		return m.Signer
 	}
 	return ""
 }
 
-// MsgDeleteNameAuthorityResponse
-type MsgDeleteNameAuthorityResponse struct {
+// MsgDeleteNameResponse
+type MsgDeleteNameResponse struct {
 }
 
-func (m *MsgDeleteNameAuthorityResponse) Reset()         { *m = MsgDeleteNameAuthorityResponse{} }
-func (m *MsgDeleteNameAuthorityResponse) String() string { return proto.CompactTextString(m) }
-func (*MsgDeleteNameAuthorityResponse) ProtoMessage()    {}
-func (*MsgDeleteNameAuthorityResponse) Descriptor() ([]byte, []int) {
+func (m *MsgDeleteNameResponse) Reset()         { *m = MsgDeleteNameResponse{} }
+func (m *MsgDeleteNameResponse) String() string { return proto.CompactTextString(m) }
+func (*MsgDeleteNameResponse) ProtoMessage()    {}
+func (*MsgDeleteNameResponse) Descriptor() ([]byte, []int) {
 	return fileDescriptor_3c6eb2e5a4d8fa03, []int{10}
 }
-func (m *MsgDeleteNameAuthorityResponse) XXX_Unmarshal(b []byte) error {
+func (m *MsgDeleteNameResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
 }
-func (m *MsgDeleteNameAuthorityResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *MsgDeleteNameResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	if deterministic {
-		return xxx_messageInfo_MsgDeleteNameAuthorityResponse.Marshal(b, m, deterministic)
+		return xxx_messageInfo_MsgDeleteNameResponse.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
 		n, err := m.MarshalToSizedBuffer(b)
@@ -562,17 +562,17 @@ func (m *MsgDeleteNameAuthorityResponse) XXX_Marshal(b []byte, deterministic boo
 		return b[:n], nil
 	}
 }
-func (m *MsgDeleteNameAuthorityResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MsgDeleteNameAuthorityResponse.Merge(m, src)
+func (m *MsgDeleteNameResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MsgDeleteNameResponse.Merge(m, src)
 }
-func (m *MsgDeleteNameAuthorityResponse) XXX_Size() int {
+func (m *MsgDeleteNameResponse) XXX_Size() int {
 	return m.Size()
 }
-func (m *MsgDeleteNameAuthorityResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_MsgDeleteNameAuthorityResponse.DiscardUnknown(m)
+func (m *MsgDeleteNameResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_MsgDeleteNameResponse.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_MsgDeleteNameAuthorityResponse proto.InternalMessageInfo
+var xxx_messageInfo_MsgDeleteNameResponse proto.InternalMessageInfo
 
 // MsgRenewRecord
 type MsgRenewRecord struct {
@@ -1050,8 +1050,8 @@ func init() {
 	proto.RegisterType((*MsgReserveAuthorityResponse)(nil), "cerc.registry.v1.MsgReserveAuthorityResponse")
 	proto.RegisterType((*MsgSetAuthorityBond)(nil), "cerc.registry.v1.MsgSetAuthorityBond")
 	proto.RegisterType((*MsgSetAuthorityBondResponse)(nil), "cerc.registry.v1.MsgSetAuthorityBondResponse")
-	proto.RegisterType((*MsgDeleteNameAuthority)(nil), "cerc.registry.v1.MsgDeleteNameAuthority")
-	proto.RegisterType((*MsgDeleteNameAuthorityResponse)(nil), "cerc.registry.v1.MsgDeleteNameAuthorityResponse")
+	proto.RegisterType((*MsgDeleteName)(nil), "cerc.registry.v1.MsgDeleteName")
+	proto.RegisterType((*MsgDeleteNameResponse)(nil), "cerc.registry.v1.MsgDeleteNameResponse")
 	proto.RegisterType((*MsgRenewRecord)(nil), "cerc.registry.v1.MsgRenewRecord")
 	proto.RegisterType((*MsgRenewRecordResponse)(nil), "cerc.registry.v1.MsgRenewRecordResponse")
 	proto.RegisterType((*MsgAssociateBond)(nil), "cerc.registry.v1.MsgAssociateBond")
@@ -1067,72 +1067,72 @@ func init() {
 func init() { proto.RegisterFile("cerc/registry/v1/tx.proto", fileDescriptor_3c6eb2e5a4d8fa03) }
 
 var fileDescriptor_3c6eb2e5a4d8fa03 = []byte{
-	// 1037 bytes of a gzipped FileDescriptorProto
+	// 1036 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x97, 0x41, 0x6f, 0xe3, 0x44,
-	0x14, 0xc7, 0x3b, 0xc9, 0x6e, 0x4b, 0x5e, 0xa0, 0xea, 0x9a, 0xb2, 0xa4, 0x6e, 0xea, 0xa4, 0xd3,
-	0x26, 0xcd, 0x76, 0x69, 0xbc, 0x1b, 0x4e, 0xf4, 0xd6, 0x88, 0x4b, 0x0f, 0x01, 0xe4, 0x8a, 0x0b,
-	0x97, 0xca, 0x8d, 0x47, 0x5e, 0xa3, 0xc4, 0x53, 0x3c, 0xde, 0x66, 0x23, 0x71, 0x80, 0xbd, 0x01,
-	0x42, 0x8b, 0x84, 0x84, 0xc4, 0x81, 0x23, 0x17, 0x4e, 0x7b, 0xe3, 0x2b, 0xec, 0x71, 0x05, 0x17,
-	0x4e, 0x11, 0x6a, 0x91, 0xf6, 0x9e, 0x4f, 0x80, 0x3c, 0xb6, 0xc7, 0x76, 0x6c, 0xa7, 0x01, 0x6d,
-	0x6f, 0x93, 0x79, 0xff, 0x79, 0xef, 0x37, 0x6f, 0xde, 0xf3, 0x4c, 0x60, 0xa3, 0x4f, 0x9c, 0xbe,
-	0xea, 0x10, 0xd3, 0x62, 0xae, 0x33, 0x56, 0x2f, 0x1e, 0xaa, 0xee, 0x93, 0xf6, 0xb9, 0x43, 0x5d,
-	0x2a, 0xad, 0x79, 0xa6, 0x76, 0x68, 0x6a, 0x5f, 0x3c, 0x94, 0xab, 0x26, 0xa5, 0xe6, 0x80, 0xa8,
-	0xfa, 0xb9, 0xa5, 0xea, 0xb6, 0x4d, 0x5d, 0xdd, 0xb5, 0xa8, 0xcd, 0x7c, 0xbd, 0xbc, 0x6e, 0x52,
-	0x93, 0xf2, 0xa1, 0xea, 0x8d, 0x82, 0xd9, 0x77, 0xfb, 0x94, 0x0d, 0x29, 0x53, 0x87, 0xcc, 0xf4,
-	0xbc, 0x0f, 0x99, 0x19, 0x18, 0x6a, 0xa9, 0xc8, 0x22, 0x14, 0x17, 0xe0, 0xdf, 0x10, 0xbc, 0xd9,
-	0x63, 0xe6, 0x09, 0x71, 0x35, 0xd2, 0xa7, 0x8e, 0x21, 0x1d, 0xc2, 0xca, 0x19, 0xb5, 0x8d, 0x53,
-	0xcb, 0xa8, 0xa0, 0x3a, 0x6a, 0x95, 0xba, 0xdb, 0xd3, 0x49, 0x6d, 0xeb, 0x73, 0x46, 0xed, 0x43,
-	0x1c, 0x18, 0x70, 0x7d, 0xac, 0x0f, 0x07, 0xd1, 0x4f, 0x6d, 0xd9, 0x1b, 0x1d, 0x1b, 0xd2, 0x5d,
-	0x58, 0x66, 0x96, 0x69, 0x13, 0xa7, 0x52, 0xf0, 0x96, 0x6a, 0xc1, 0x2f, 0xe9, 0x03, 0x58, 0x39,
-	0xd7, 0xc7, 0x03, 0xaa, 0x1b, 0x95, 0x62, 0x1d, 0xb5, 0xca, 0x9d, 0x8d, 0xf6, 0xec, 0xb6, 0xdb,
-	0x9f, 0xf8, 0x82, 0xee, 0xad, 0x17, 0x93, 0xda, 0x92, 0x16, 0xea, 0x0f, 0xcb, 0x4f, 0x5f, 0x3d,
-	0xdf, 0x0f, 0xfc, 0xe0, 0x26, 0xac, 0xc7, 0x59, 0x35, 0xc2, 0xce, 0xa9, 0xcd, 0x88, 0xb4, 0x0a,
-	0x85, 0x10, 0x57, 0x2b, 0x58, 0x06, 0xfe, 0x15, 0xc1, 0x4a, 0xe0, 0x4f, 0x7a, 0x00, 0xcb, 0x0e,
-	0x57, 0x73, 0x7b, 0xb9, 0x53, 0x49, 0x87, 0x0e, 0xbc, 0x05, 0x3a, 0xe9, 0x11, 0x80, 0x17, 0x4f,
-	0x77, 0x1f, 0x3b, 0x84, 0x55, 0x0a, 0xf5, 0x62, 0xab, 0xdc, 0xd9, 0x4c, 0xaf, 0x3a, 0x09, 0x35,
-	0xdd, 0xfb, 0x1e, 0xf2, 0x74, 0x52, 0xdb, 0xf1, 0xb3, 0x14, 0x2d, 0x0e, 0x13, 0x15, 0x9b, 0xd1,
-	0x62, 0xbe, 0xf1, 0xa7, 0x00, 0xfe, 0x7e, 0x3e, 0xd2, 0x87, 0x44, 0x5a, 0x83, 0xe2, 0xc0, 0xb1,
-	0x83, 0x6d, 0x78, 0x43, 0x6f, 0xa6, 0x6f, 0x19, 0x41, 0x32, 0xbd, 0x61, 0x2c, 0xc3, 0xc5, 0x78,
-	0x86, 0x93, 0x69, 0x5a, 0x07, 0x29, 0x72, 0x1b, 0x26, 0x09, 0x1b, 0xf0, 0x76, 0x8f, 0x99, 0x1a,
-	0x61, 0xc4, 0xb9, 0x20, 0x47, 0x8f, 0xdd, 0x47, 0xd4, 0xb1, 0xdc, 0xb1, 0x24, 0xc1, 0x2d, 0x5b,
-	0x1f, 0x92, 0x20, 0x2c, 0x1f, 0xe7, 0x9e, 0xe3, 0x3a, 0xdc, 0xa6, 0xa3, 0x28, 0xb8, 0xff, 0x23,
-	0x19, 0x7b, 0x0b, 0x36, 0x33, 0xa2, 0x08, 0x88, 0x6f, 0x11, 0xa7, 0x38, 0x21, 0xae, 0xb0, 0x75,
-	0xa9, 0x6d, 0x64, 0x52, 0xc4, 0x2a, 0xb1, 0xf0, 0xff, 0x2b, 0x71, 0x4e, 0x9e, 0x7c, 0xd6, 0x59,
-	0x16, 0xc1, 0xfa, 0x31, 0xdc, 0xed, 0x31, 0xf3, 0x43, 0x32, 0x20, 0x2e, 0xf1, 0x32, 0x19, 0xe5,
-	0x2c, 0x7d, 0x52, 0x39, 0x19, 0x4b, 0xc6, 0xab, 0x83, 0x92, 0xed, 0x50, 0x84, 0x1c, 0xc3, 0x2a,
-	0xcf, 0x9e, 0x4d, 0x46, 0x41, 0x3b, 0x76, 0xa1, 0xe4, 0x97, 0x65, 0xd4, 0x90, 0x8d, 0xe9, 0xa4,
-	0xb6, 0xed, 0xa7, 0x41, 0x98, 0xc2, 0x44, 0x44, 0x13, 0xda, 0x1b, 0xfe, 0x38, 0xbf, 0x2d, 0x93,
-	0x70, 0x15, 0xbe, 0xdb, 0x58, 0x68, 0x01, 0xf5, 0x3b, 0x82, 0xb5, 0x1e, 0x33, 0x8f, 0x18, 0xa3,
-	0x7d, 0x4b, 0x77, 0x09, 0x3f, 0xb0, 0xd7, 0xc1, 0x75, 0xe3, 0x07, 0x2c, 0x43, 0x65, 0x16, 0x5c,
-	0xec, 0xea, 0x4b, 0xb8, 0xe3, 0x1d, 0x86, 0xf5, 0xda, 0x77, 0xb5, 0x50, 0xb6, 0x37, 0x61, 0x23,
-	0x15, 0x5d, 0xa0, 0x8d, 0xf8, 0x67, 0x2e, 0x32, 0xfa, 0xe7, 0xc1, 0x6e, 0xe2, 0xd3, 0x9c, 0xa4,
-	0x52, 0xa0, 0x9a, 0x15, 0x58, 0x80, 0xfd, 0x81, 0xe0, 0x1d, 0x5e, 0x24, 0xfa, 0x2c, 0xda, 0x31,
-	0x94, 0x6d, 0x32, 0x3a, 0x4d, 0xe2, 0xdd, 0x9b, 0x4e, 0x6a, 0x0d, 0x1f, 0x2f, 0x66, 0x0c, 0x11,
-	0xe3, 0x53, 0x5a, 0xc9, 0x26, 0xa3, 0xae, 0x4f, 0x7a, 0x0c, 0x65, 0x3a, 0x30, 0x4e, 0x93, 0x95,
-	0x11, 0x73, 0x15, 0x33, 0x86, 0xae, 0xe2, 0x53, 0x5a, 0x89, 0x0e, 0x8c, 0xee, 0x7f, 0x28, 0x92,
-	0x1a, 0x6c, 0x65, 0xee, 0x29, 0xdc, 0x75, 0xe7, 0x59, 0x19, 0x8a, 0x3d, 0x66, 0x4a, 0x63, 0x28,
-	0x45, 0xd7, 0xa4, 0x92, 0xbe, 0x10, 0xe2, 0x57, 0x93, 0xdc, 0x9c, 0x6f, 0x17, 0x29, 0xdd, 0x7d,
-	0xfa, 0xe7, 0x3f, 0x3f, 0x16, 0x14, 0x5c, 0x55, 0x53, 0x37, 0x35, 0x23, 0xee, 0x69, 0x70, 0x25,
-	0x7d, 0x8d, 0xa0, 0x1c, 0xff, 0x2a, 0xd4, 0x33, 0xbd, 0xc7, 0x14, 0x72, 0xeb, 0x3a, 0x85, 0x20,
-	0x68, 0x72, 0x82, 0x3a, 0x56, 0xd4, 0x8c, 0xb7, 0x82, 0x77, 0x48, 0x01, 0xc3, 0x37, 0x08, 0xde,
-	0x4a, 0x7e, 0x03, 0x70, 0x66, 0x8c, 0x84, 0x46, 0xde, 0xbf, 0x5e, 0x23, 0x48, 0x5a, 0x9c, 0x04,
-	0xe3, 0x7a, 0x9a, 0x44, 0x1c, 0x0e, 0x3f, 0x67, 0xe9, 0x7b, 0x04, 0xab, 0x33, 0xad, 0xbb, 0x93,
-	0x19, 0x28, 0x29, 0x92, 0xef, 0x2f, 0x20, 0x12, 0x38, 0xf7, 0x38, 0xce, 0x0e, 0xde, 0x4e, 0xe3,
-	0x18, 0x56, 0x92, 0xe7, 0x67, 0x04, 0x77, 0xd2, 0xfd, 0xda, 0xbc, 0x26, 0x5a, 0xa0, 0x93, 0xdb,
-	0x8b, 0xe9, 0x04, 0xd8, 0x7b, 0x1c, 0xac, 0x89, 0x77, 0xe7, 0x82, 0x39, 0x01, 0xc5, 0x2f, 0x08,
-	0xa4, 0x8c, 0x8e, 0xdd, 0xcb, 0x29, 0x90, 0x59, 0xa1, 0xac, 0x2e, 0x28, 0x14, 0x78, 0x07, 0x1c,
-	0x6f, 0x0f, 0x37, 0xb2, 0x0a, 0x4a, 0x4f, 0xf1, 0x7d, 0x01, 0x2b, 0xe1, 0x0b, 0xa8, 0x9a, 0xd7,
-	0x34, 0x9e, 0x55, 0xde, 0x9d, 0x67, 0x15, 0xd1, 0x31, 0x8f, 0x5e, 0xc5, 0x72, 0x76, 0x43, 0xf1,
-	0x97, 0xc5, 0x77, 0xbc, 0x9d, 0xf8, 0x13, 0x85, 0xc7, 0x6d, 0xe4, 0x6c, 0x31, 0xf9, 0x88, 0x91,
-	0x0f, 0x16, 0x92, 0x2d, 0xd6, 0x58, 0x7c, 0x8d, 0x4f, 0xf3, 0x0c, 0x01, 0x44, 0x8f, 0x02, 0x29,
-	0xbb, 0x73, 0x33, 0x5e, 0x0d, 0xf2, 0x83, 0x45, 0x95, 0x02, 0xa9, 0xc1, 0x91, 0x6a, 0x78, 0x2b,
-	0xa3, 0x72, 0xf8, 0x32, 0x9f, 0xe8, 0x27, 0x04, 0x6b, 0xa9, 0x27, 0x5a, 0x23, 0x2f, 0xfd, 0x09,
-	0x59, 0x4e, 0x92, 0x72, 0x1f, 0x59, 0x73, 0x6a, 0xd9, 0x3b, 0x2e, 0x3d, 0x5c, 0xc4, 0xfb, 0x4c,
-	0xbe, 0xfd, 0xd5, 0xab, 0xe7, 0xfb, 0xa8, 0x7b, 0xf4, 0xe2, 0x52, 0x41, 0x2f, 0x2f, 0x15, 0xf4,
-	0xf7, 0xa5, 0x82, 0x7e, 0xb8, 0x52, 0x96, 0x5e, 0x5e, 0x29, 0x4b, 0x7f, 0x5d, 0x29, 0x4b, 0x9f,
-	0xed, 0x99, 0x96, 0xdb, 0xbe, 0x30, 0xce, 0xda, 0x2e, 0xe5, 0x0e, 0x0f, 0x2c, 0xaa, 0x0e, 0xf4,
-	0x3e, 0xb5, 0xad, 0x7e, 0xc7, 0x50, 0x9f, 0x08, 0xff, 0x67, 0xcb, 0xfc, 0xef, 0xcf, 0xfb, 0xff,
-	0x06, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x74, 0xfe, 0xc2, 0x9b, 0x0d, 0x00, 0x00,
+	0x14, 0xc7, 0x3b, 0xc9, 0x6e, 0x4b, 0x5e, 0xd8, 0x2a, 0x6b, 0xca, 0x6e, 0xea, 0xa6, 0x4e, 0x3a,
+	0x6d, 0xd2, 0x6c, 0x4b, 0x63, 0x36, 0x9c, 0xe8, 0xad, 0x11, 0x42, 0xea, 0x21, 0x08, 0xb9, 0xe2,
+	0xc2, 0x25, 0x72, 0xe3, 0x91, 0xd7, 0x28, 0xf1, 0x14, 0x8f, 0xb7, 0xd9, 0x48, 0x20, 0xc1, 0x1e,
+	0x90, 0x40, 0x42, 0x42, 0x42, 0x20, 0x71, 0xe0, 0xc8, 0x85, 0xd3, 0xde, 0xf8, 0x0a, 0x7b, 0x5c,
+	0xc1, 0x85, 0x53, 0x84, 0x5a, 0xa4, 0xbd, 0xf7, 0x13, 0x20, 0x8f, 0xed, 0x89, 0x1d, 0xdb, 0x69,
+	0x58, 0x6d, 0x6f, 0x93, 0x79, 0x7f, 0xbf, 0xff, 0x6f, 0xde, 0x9b, 0xb1, 0x27, 0xb0, 0xde, 0x27,
+	0x4e, 0x5f, 0x75, 0x88, 0x69, 0x31, 0xd7, 0x19, 0xab, 0xe7, 0x0f, 0x55, 0xf7, 0x49, 0xeb, 0xcc,
+	0xa1, 0x2e, 0x95, 0x4a, 0x5e, 0xa8, 0x15, 0x86, 0x5a, 0xe7, 0x0f, 0xe5, 0x8a, 0x49, 0xa9, 0x39,
+	0x20, 0xaa, 0x7e, 0x66, 0xa9, 0xba, 0x6d, 0x53, 0x57, 0x77, 0x2d, 0x6a, 0x33, 0x5f, 0x2f, 0xaf,
+	0x99, 0xd4, 0xa4, 0x7c, 0xa8, 0x7a, 0xa3, 0x60, 0xf6, 0x7e, 0x9f, 0xb2, 0x21, 0x65, 0xea, 0x90,
+	0x99, 0x5e, 0xf6, 0x21, 0x33, 0x83, 0x40, 0x35, 0xe1, 0x2c, 0xac, 0xb8, 0x00, 0xff, 0x8e, 0xe0,
+	0xcd, 0x2e, 0x33, 0x4f, 0x88, 0xab, 0x91, 0x3e, 0x75, 0x0c, 0xe9, 0x10, 0x56, 0x4e, 0xa9, 0x6d,
+	0xf4, 0x2c, 0xa3, 0x8c, 0x6a, 0xa8, 0x59, 0xe8, 0x6c, 0x5d, 0x4d, 0xaa, 0x9b, 0x9f, 0x31, 0x6a,
+	0x1f, 0xe2, 0x20, 0x80, 0x6b, 0x63, 0x7d, 0x38, 0x98, 0xfe, 0xd4, 0x96, 0xbd, 0xd1, 0xb1, 0x21,
+	0xdd, 0x83, 0x65, 0x66, 0x99, 0x36, 0x71, 0xca, 0x39, 0xef, 0x51, 0x2d, 0xf8, 0x25, 0xbd, 0x0f,
+	0x2b, 0x67, 0xfa, 0x78, 0x40, 0x75, 0xa3, 0x9c, 0xaf, 0xa1, 0x66, 0xb1, 0xbd, 0xde, 0x9a, 0x5d,
+	0x76, 0xeb, 0x63, 0x5f, 0xd0, 0xb9, 0xf5, 0x7c, 0x52, 0x5d, 0xd2, 0x42, 0xfd, 0x61, 0xf1, 0xe9,
+	0xcb, 0x67, 0x7b, 0x41, 0x1e, 0xdc, 0x80, 0xb5, 0x28, 0xab, 0x46, 0xd8, 0x19, 0xb5, 0x19, 0x91,
+	0x56, 0x21, 0x17, 0xe2, 0x6a, 0x39, 0xcb, 0xc0, 0xbf, 0x21, 0x58, 0x09, 0xf2, 0x49, 0xef, 0xc2,
+	0xb2, 0xc3, 0xd5, 0x3c, 0x5e, 0x6c, 0x97, 0x93, 0xd6, 0x41, 0xb6, 0x40, 0x27, 0x3d, 0x02, 0xf0,
+	0xfc, 0x74, 0xf7, 0xb1, 0x43, 0x58, 0x39, 0x57, 0xcb, 0x37, 0x8b, 0xed, 0x8d, 0xe4, 0x53, 0x27,
+	0xa1, 0xa6, 0xb3, 0xef, 0x21, 0x5f, 0x4d, 0xaa, 0xdb, 0x7e, 0x95, 0xa6, 0x0f, 0x87, 0x85, 0x8a,
+	0xcc, 0x68, 0x91, 0xdc, 0xf8, 0x13, 0x00, 0x7f, 0x3d, 0x1f, 0xe9, 0x43, 0x22, 0x95, 0x20, 0x3f,
+	0x70, 0xec, 0x60, 0x19, 0xde, 0xd0, 0x9b, 0xe9, 0x5b, 0x46, 0x50, 0x4c, 0x6f, 0x18, 0xa9, 0x70,
+	0x3e, 0x5a, 0xe1, 0x78, 0x99, 0xd6, 0x40, 0x9a, 0xa6, 0x0d, 0x8b, 0x84, 0x0d, 0x78, 0xab, 0xcb,
+	0x4c, 0x8d, 0x30, 0xe2, 0x9c, 0x93, 0xa3, 0xc7, 0xee, 0x23, 0xea, 0x58, 0xee, 0x58, 0x92, 0xe0,
+	0x96, 0xad, 0x0f, 0x49, 0x60, 0xcb, 0xc7, 0x99, 0x7d, 0x5c, 0x83, 0xdb, 0x74, 0x34, 0x35, 0xf7,
+	0x7f, 0xc4, 0xbd, 0x37, 0x61, 0x23, 0xc5, 0x45, 0x40, 0x7c, 0x87, 0x38, 0xc5, 0x09, 0x71, 0x45,
+	0xac, 0x43, 0x6d, 0x23, 0x95, 0x22, 0xb2, 0x13, 0x73, 0xaf, 0xbe, 0x13, 0xe7, 0xd4, 0xc9, 0x67,
+	0x9d, 0x65, 0x11, 0xac, 0x1f, 0xc2, 0x9d, 0x2e, 0x33, 0x3f, 0x20, 0x03, 0xe2, 0x92, 0x8c, 0x06,
+	0x65, 0x14, 0x2a, 0x6e, 0x73, 0x1f, 0xde, 0x8e, 0xe5, 0x11, 0x06, 0x63, 0x58, 0xe5, 0xb5, 0xb2,
+	0xc9, 0x28, 0x38, 0x7c, 0x1d, 0x28, 0xf8, 0x9b, 0x70, 0x7a, 0xfc, 0xea, 0x57, 0x93, 0xea, 0x96,
+	0xbf, 0x68, 0x11, 0x0a, 0x97, 0x3d, 0x9d, 0xd0, 0xde, 0xf0, 0xc7, 0xd9, 0x87, 0x30, 0xce, 0x54,
+	0x86, 0x7b, 0x71, 0x6b, 0x01, 0xf5, 0x07, 0x82, 0x52, 0x97, 0x99, 0x47, 0x8c, 0xd1, 0xbe, 0xa5,
+	0xbb, 0x84, 0xb7, 0xe7, 0x75, 0x70, 0xdd, 0x78, 0x3b, 0x65, 0x28, 0xcf, 0x82, 0x8b, 0x55, 0x7d,
+	0x01, 0x77, 0xbd, 0x1e, 0x58, 0xaf, 0x7d, 0x55, 0x0b, 0x55, 0x7b, 0x03, 0xd6, 0x13, 0xee, 0x02,
+	0x6d, 0xc4, 0x5f, 0x6a, 0xd3, 0xa0, 0xdf, 0x0f, 0x76, 0x13, 0x2f, 0xe2, 0x38, 0x95, 0x02, 0x95,
+	0x34, 0x63, 0x01, 0xf6, 0x27, 0xe2, 0x1b, 0x57, 0x23, 0xfa, 0x2c, 0xda, 0x31, 0x14, 0x6d, 0x32,
+	0xea, 0xc5, 0xf1, 0x1e, 0x5c, 0x4d, 0xaa, 0x75, 0x1f, 0x2f, 0x12, 0x0c, 0x11, 0xa3, 0x53, 0x5a,
+	0xc1, 0x26, 0xa3, 0x8e, 0x4f, 0x7a, 0x0c, 0x45, 0x3a, 0x30, 0x7a, 0xf1, 0x9d, 0x11, 0x49, 0x15,
+	0x09, 0x86, 0xa9, 0xa2, 0x53, 0x5a, 0x81, 0x0e, 0x8c, 0xce, 0xff, 0xd8, 0x24, 0x55, 0xd8, 0x4c,
+	0x5d, 0x53, 0xb8, 0xea, 0xf6, 0x37, 0x45, 0xc8, 0x77, 0x99, 0x29, 0x8d, 0xa1, 0x30, 0xfd, 0x28,
+	0x2a, 0xc9, 0xd7, 0x7f, 0xf4, 0x43, 0x24, 0x37, 0xe6, 0xc7, 0x45, 0x49, 0x77, 0x9e, 0xfe, 0xf5,
+	0xef, 0x8f, 0x39, 0x05, 0x57, 0xd4, 0xc4, 0x77, 0x99, 0x11, 0xb7, 0x17, 0x7c, 0x80, 0xbe, 0x46,
+	0x50, 0x8c, 0xbe, 0x15, 0x6a, 0xa9, 0xd9, 0x23, 0x0a, 0xb9, 0x79, 0x9d, 0x42, 0x10, 0x34, 0x38,
+	0x41, 0x0d, 0x2b, 0x6a, 0xca, 0xcd, 0xc0, 0x6b, 0x52, 0xc0, 0xf0, 0x2d, 0x82, 0x3b, 0xf1, 0x77,
+	0x00, 0x4e, 0xf5, 0x88, 0x69, 0xe4, 0xbd, 0xeb, 0x35, 0x82, 0xa4, 0xc9, 0x49, 0x30, 0xae, 0x25,
+	0x49, 0x44, 0x73, 0x78, 0x9f, 0xa5, 0xef, 0x11, 0xac, 0xce, 0x1c, 0xdd, 0xed, 0x54, 0xa3, 0xb8,
+	0x48, 0xde, 0x5f, 0x40, 0x24, 0x70, 0x1e, 0x70, 0x9c, 0x6d, 0xbc, 0x95, 0xc4, 0x31, 0xac, 0x38,
+	0xcf, 0x2f, 0x08, 0xee, 0x26, 0xcf, 0x6b, 0xe3, 0x1a, 0xb7, 0x40, 0x27, 0xb7, 0x16, 0xd3, 0x09,
+	0xb0, 0x77, 0x38, 0x58, 0x03, 0xef, 0xcc, 0x05, 0x73, 0x02, 0x8a, 0x5f, 0x11, 0x48, 0x29, 0x27,
+	0x76, 0x37, 0x63, 0x83, 0xcc, 0x0a, 0x65, 0x75, 0x41, 0xa1, 0xc0, 0x3b, 0xe0, 0x78, 0xbb, 0xb8,
+	0x9e, 0xb6, 0xa1, 0xf4, 0x04, 0xdf, 0xe7, 0xb0, 0x12, 0xde, 0x77, 0x2a, 0x59, 0x87, 0xc6, 0x8b,
+	0xca, 0x3b, 0xf3, 0xa2, 0xc2, 0x1d, 0x73, 0xf7, 0x0a, 0x96, 0xd3, 0x0f, 0x14, 0xbf, 0x47, 0x7c,
+	0x09, 0x10, 0xf9, 0x88, 0x57, 0xd3, 0xcb, 0x2f, 0x04, 0xf2, 0xee, 0x35, 0x02, 0xe1, 0x5d, 0xe7,
+	0xde, 0x55, 0xbc, 0x99, 0xd2, 0x18, 0xae, 0xf6, 0xed, 0x7f, 0x42, 0x50, 0x4a, 0xdc, 0xba, 0xea,
+	0x19, 0x65, 0x8e, 0xcb, 0xe4, 0x83, 0x85, 0x64, 0x82, 0x68, 0x9f, 0x13, 0xd5, 0xf1, 0x76, 0x5a,
+	0x2f, 0xf8, 0x33, 0x3d, 0x5d, 0x20, 0xfc, 0x8c, 0xa0, 0x94, 0xb8, 0x87, 0xd5, 0xb3, 0xaa, 0x1e,
+	0x93, 0x65, 0x70, 0x65, 0xde, 0xa4, 0xe6, 0x6c, 0x61, 0xaf, 0x4b, 0x82, 0x89, 0x1f, 0x2f, 0xf9,
+	0xf6, 0x57, 0x2f, 0x9f, 0xed, 0xa1, 0xce, 0xd1, 0xf3, 0x0b, 0x05, 0xbd, 0xb8, 0x50, 0xd0, 0x3f,
+	0x17, 0x0a, 0xfa, 0xe1, 0x52, 0x59, 0x7a, 0x71, 0xa9, 0x2c, 0xfd, 0x7d, 0xa9, 0x2c, 0x7d, 0xba,
+	0x6b, 0x5a, 0x6e, 0xeb, 0xdc, 0x38, 0x6d, 0xb9, 0x94, 0x27, 0x3c, 0xb0, 0xa8, 0x3a, 0xd0, 0xfb,
+	0xd4, 0xb6, 0xfa, 0x6d, 0x43, 0x7d, 0x22, 0xf2, 0x9f, 0x2e, 0xf3, 0xff, 0x38, 0xef, 0xfd, 0x17,
+	0x00, 0x00, 0xff, 0xff, 0x69, 0x83, 0x2d, 0xbe, 0x80, 0x0d, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1161,10 +1161,10 @@ type MsgClient interface {
 	ReassociateRecords(ctx context.Context, in *MsgReassociateRecords, opts ...grpc.CallOption) (*MsgReassociateRecordsResponse, error)
 	// SetName will store the name with given lrn and name
 	SetName(ctx context.Context, in *MsgSetName, opts ...grpc.CallOption) (*MsgSetNameResponse, error)
-	// Reserve name
-	ReserveName(ctx context.Context, in *MsgReserveAuthority, opts ...grpc.CallOption) (*MsgReserveAuthorityResponse, error)
 	// Delete Name method will remove authority name
-	DeleteName(ctx context.Context, in *MsgDeleteNameAuthority, opts ...grpc.CallOption) (*MsgDeleteNameAuthorityResponse, error)
+	DeleteName(ctx context.Context, in *MsgDeleteName, opts ...grpc.CallOption) (*MsgDeleteNameResponse, error)
+	// Reserve authority name
+	ReserveAuthority(ctx context.Context, in *MsgReserveAuthority, opts ...grpc.CallOption) (*MsgReserveAuthorityResponse, error)
 	// SetAuthorityBond
 	SetAuthorityBond(ctx context.Context, in *MsgSetAuthorityBond, opts ...grpc.CallOption) (*MsgSetAuthorityBondResponse, error)
 }
@@ -1240,18 +1240,18 @@ func (c *msgClient) SetName(ctx context.Context, in *MsgSetName, opts ...grpc.Ca
 	return out, nil
 }
 
-func (c *msgClient) ReserveName(ctx context.Context, in *MsgReserveAuthority, opts ...grpc.CallOption) (*MsgReserveAuthorityResponse, error) {
-	out := new(MsgReserveAuthorityResponse)
-	err := c.cc.Invoke(ctx, "/cerc.registry.v1.Msg/ReserveName", in, out, opts...)
+func (c *msgClient) DeleteName(ctx context.Context, in *MsgDeleteName, opts ...grpc.CallOption) (*MsgDeleteNameResponse, error) {
+	out := new(MsgDeleteNameResponse)
+	err := c.cc.Invoke(ctx, "/cerc.registry.v1.Msg/DeleteName", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *msgClient) DeleteName(ctx context.Context, in *MsgDeleteNameAuthority, opts ...grpc.CallOption) (*MsgDeleteNameAuthorityResponse, error) {
-	out := new(MsgDeleteNameAuthorityResponse)
-	err := c.cc.Invoke(ctx, "/cerc.registry.v1.Msg/DeleteName", in, out, opts...)
+func (c *msgClient) ReserveAuthority(ctx context.Context, in *MsgReserveAuthority, opts ...grpc.CallOption) (*MsgReserveAuthorityResponse, error) {
+	out := new(MsgReserveAuthorityResponse)
+	err := c.cc.Invoke(ctx, "/cerc.registry.v1.Msg/ReserveAuthority", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -1283,10 +1283,10 @@ type MsgServer interface {
 	ReassociateRecords(context.Context, *MsgReassociateRecords) (*MsgReassociateRecordsResponse, error)
 	// SetName will store the name with given lrn and name
 	SetName(context.Context, *MsgSetName) (*MsgSetNameResponse, error)
-	// Reserve name
-	ReserveName(context.Context, *MsgReserveAuthority) (*MsgReserveAuthorityResponse, error)
 	// Delete Name method will remove authority name
-	DeleteName(context.Context, *MsgDeleteNameAuthority) (*MsgDeleteNameAuthorityResponse, error)
+	DeleteName(context.Context, *MsgDeleteName) (*MsgDeleteNameResponse, error)
+	// Reserve authority name
+	ReserveAuthority(context.Context, *MsgReserveAuthority) (*MsgReserveAuthorityResponse, error)
 	// SetAuthorityBond
 	SetAuthorityBond(context.Context, *MsgSetAuthorityBond) (*MsgSetAuthorityBondResponse, error)
 }
@@ -1316,12 +1316,12 @@ func (*UnimplementedMsgServer) ReassociateRecords(ctx context.Context, req *MsgR
 func (*UnimplementedMsgServer) SetName(ctx context.Context, req *MsgSetName) (*MsgSetNameResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetName not implemented")
 }
-func (*UnimplementedMsgServer) ReserveName(ctx context.Context, req *MsgReserveAuthority) (*MsgReserveAuthorityResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ReserveName not implemented")
-}
-func (*UnimplementedMsgServer) DeleteName(ctx context.Context, req *MsgDeleteNameAuthority) (*MsgDeleteNameAuthorityResponse, error) {
+func (*UnimplementedMsgServer) DeleteName(ctx context.Context, req *MsgDeleteName) (*MsgDeleteNameResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteName not implemented")
 }
+func (*UnimplementedMsgServer) ReserveAuthority(ctx context.Context, req *MsgReserveAuthority) (*MsgReserveAuthorityResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ReserveAuthority not implemented")
+}
 func (*UnimplementedMsgServer) SetAuthorityBond(ctx context.Context, req *MsgSetAuthorityBond) (*MsgSetAuthorityBondResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetAuthorityBond not implemented")
 }
@@ -1456,26 +1456,8 @@ func _Msg_SetName_Handler(srv interface{}, ctx context.Context, dec func(interfa
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Msg_ReserveName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgReserveAuthority)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MsgServer).ReserveName(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/cerc.registry.v1.Msg/ReserveName",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServer).ReserveName(ctx, req.(*MsgReserveAuthority))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _Msg_DeleteName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(MsgDeleteNameAuthority)
+	in := new(MsgDeleteName)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1487,7 +1469,25 @@ func _Msg_DeleteName_Handler(srv interface{}, ctx context.Context, dec func(inte
 		FullMethod: "/cerc.registry.v1.Msg/DeleteName",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MsgServer).DeleteName(ctx, req.(*MsgDeleteNameAuthority))
+		return srv.(MsgServer).DeleteName(ctx, req.(*MsgDeleteName))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Msg_ReserveAuthority_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(MsgReserveAuthority)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(MsgServer).ReserveAuthority(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/cerc.registry.v1.Msg/ReserveAuthority",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(MsgServer).ReserveAuthority(ctx, req.(*MsgReserveAuthority))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1542,14 +1542,14 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
 			MethodName: "SetName",
 			Handler:    _Msg_SetName_Handler,
 		},
-		{
-			MethodName: "ReserveName",
-			Handler:    _Msg_ReserveName_Handler,
-		},
 		{
 			MethodName: "DeleteName",
 			Handler:    _Msg_DeleteName_Handler,
 		},
+		{
+			MethodName: "ReserveAuthority",
+			Handler:    _Msg_ReserveAuthority_Handler,
+		},
 		{
 			MethodName: "SetAuthorityBond",
 			Handler:    _Msg_SetAuthorityBond_Handler,
@@ -1886,7 +1886,7 @@ func (m *MsgSetAuthorityBondResponse) MarshalToSizedBuffer(dAtA []byte) (int, er
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgDeleteNameAuthority) Marshal() (dAtA []byte, err error) {
+func (m *MsgDeleteName) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1896,12 +1896,12 @@ func (m *MsgDeleteNameAuthority) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgDeleteNameAuthority) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgDeleteName) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgDeleteNameAuthority) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgDeleteName) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -1923,7 +1923,7 @@ func (m *MsgDeleteNameAuthority) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	return len(dAtA) - i, nil
 }
 
-func (m *MsgDeleteNameAuthorityResponse) Marshal() (dAtA []byte, err error) {
+func (m *MsgDeleteNameResponse) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
 	n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -1933,12 +1933,12 @@ func (m *MsgDeleteNameAuthorityResponse) Marshal() (dAtA []byte, err error) {
 	return dAtA[:n], nil
 }
 
-func (m *MsgDeleteNameAuthorityResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *MsgDeleteNameResponse) MarshalTo(dAtA []byte) (int, error) {
 	size := m.Size()
 	return m.MarshalToSizedBuffer(dAtA[:size])
 }
 
-func (m *MsgDeleteNameAuthorityResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *MsgDeleteNameResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	i := len(dAtA)
 	_ = i
 	var l int
@@ -2412,7 +2412,7 @@ func (m *MsgSetAuthorityBondResponse) Size() (n int) {
 	return n
 }
 
-func (m *MsgDeleteNameAuthority) Size() (n int) {
+func (m *MsgDeleteName) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -2429,7 +2429,7 @@ func (m *MsgDeleteNameAuthority) Size() (n int) {
 	return n
 }
 
-func (m *MsgDeleteNameAuthorityResponse) Size() (n int) {
+func (m *MsgDeleteNameResponse) Size() (n int) {
 	if m == nil {
 		return 0
 	}
@@ -3519,7 +3519,7 @@ func (m *MsgSetAuthorityBondResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgDeleteNameAuthority) Unmarshal(dAtA []byte) error {
+func (m *MsgDeleteName) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -3542,10 +3542,10 @@ func (m *MsgDeleteNameAuthority) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgDeleteNameAuthority: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgDeleteName: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgDeleteNameAuthority: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgDeleteName: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		case 1:
@@ -3633,7 +3633,7 @@ func (m *MsgDeleteNameAuthority) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *MsgDeleteNameAuthorityResponse) Unmarshal(dAtA []byte) error {
+func (m *MsgDeleteNameResponse) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
 	for iNdEx < l {
@@ -3656,10 +3656,10 @@ func (m *MsgDeleteNameAuthorityResponse) Unmarshal(dAtA []byte) error {
 		fieldNum := int32(wire >> 3)
 		wireType := int(wire & 0x7)
 		if wireType == 4 {
-			return fmt.Errorf("proto: MsgDeleteNameAuthorityResponse: wiretype end group for non-group")
+			return fmt.Errorf("proto: MsgDeleteNameResponse: wiretype end group for non-group")
 		}
 		if fieldNum <= 0 {
-			return fmt.Errorf("proto: MsgDeleteNameAuthorityResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+			return fmt.Errorf("proto: MsgDeleteNameResponse: illegal tag %d (wire type %d)", fieldNum, wire)
 		}
 		switch fieldNum {
 		default:

x/registry/tx.pb.gw.go

@@ -285,48 +285,12 @@ func local_request_Msg_SetName_0(ctx context.Context, marshaler runtime.Marshale
 
 }
 
-var (
-	filter_Msg_ReserveName_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
-)
-
-func request_Msg_ReserveName_0(ctx context.Context, marshaler runtime.Marshaler, client MsgClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq MsgReserveAuthority
-	var metadata runtime.ServerMetadata
-
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Msg_ReserveName_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := client.ReserveName(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
-
-}
-
-func local_request_Msg_ReserveName_0(ctx context.Context, marshaler runtime.Marshaler, server MsgServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq MsgReserveAuthority
-	var metadata runtime.ServerMetadata
-
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Msg_ReserveName_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := server.ReserveName(ctx, &protoReq)
-	return msg, metadata, err
-
-}
-
 var (
 	filter_Msg_DeleteName_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
 )
 
 func request_Msg_DeleteName_0(ctx context.Context, marshaler runtime.Marshaler, client MsgClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq MsgDeleteNameAuthority
+	var protoReq MsgDeleteName
 	var metadata runtime.ServerMetadata
 
 	if err := req.ParseForm(); err != nil {
@@ -342,7 +306,7 @@ func request_Msg_DeleteName_0(ctx context.Context, marshaler runtime.Marshaler,
 }
 
 func local_request_Msg_DeleteName_0(ctx context.Context, marshaler runtime.Marshaler, server MsgServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq MsgDeleteNameAuthority
+	var protoReq MsgDeleteName
 	var metadata runtime.ServerMetadata
 
 	if err := req.ParseForm(); err != nil {
@@ -357,6 +321,42 @@ func local_request_Msg_DeleteName_0(ctx context.Context, marshaler runtime.Marsh
 
 }
 
+var (
+	filter_Msg_ReserveAuthority_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
+
+func request_Msg_ReserveAuthority_0(ctx context.Context, marshaler runtime.Marshaler, client MsgClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq MsgReserveAuthority
+	var metadata runtime.ServerMetadata
+
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Msg_ReserveAuthority_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := client.ReserveAuthority(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func local_request_Msg_ReserveAuthority_0(ctx context.Context, marshaler runtime.Marshaler, server MsgServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq MsgReserveAuthority
+	var metadata runtime.ServerMetadata
+
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Msg_ReserveAuthority_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := server.ReserveAuthority(ctx, &protoReq)
+	return msg, metadata, err
+
+}
+
 var (
 	filter_Msg_SetAuthorityBond_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
 )
@@ -560,29 +560,6 @@ func RegisterMsgHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 
 	})
 
-	mux.Handle("POST", pattern_Msg_ReserveName_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_Msg_ReserveName_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_Msg_ReserveName_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
 	mux.Handle("POST", pattern_Msg_DeleteName_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -606,6 +583,29 @@ func RegisterMsgHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 
 	})
 
+	mux.Handle("POST", pattern_Msg_ReserveAuthority_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_Msg_ReserveAuthority_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_Msg_ReserveAuthority_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	mux.Handle("POST", pattern_Msg_SetAuthorityBond_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -810,26 +810,6 @@ func RegisterMsgHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 
 	})
 
-	mux.Handle("POST", pattern_Msg_ReserveName_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_Msg_ReserveName_0(rctx, inboundMarshaler, client, req, pathParams)
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_Msg_ReserveName_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
 	mux.Handle("POST", pattern_Msg_DeleteName_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -850,6 +830,26 @@ func RegisterMsgHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 
 	})
 
+	mux.Handle("POST", pattern_Msg_ReserveAuthority_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_Msg_ReserveAuthority_0(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_Msg_ReserveAuthority_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	mux.Handle("POST", pattern_Msg_SetAuthorityBond_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -888,10 +888,10 @@ var (
 
 	pattern_Msg_SetName_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"cerc", "registry", "v1", "set_name"}, "", runtime.AssumeColonVerbOpt(false)))
 
-	pattern_Msg_ReserveName_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"cerc", "registry", "v1", "reserve_name"}, "", runtime.AssumeColonVerbOpt(false)))
-
 	pattern_Msg_DeleteName_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"cerc", "registry", "v1", "delete_name"}, "", runtime.AssumeColonVerbOpt(false)))
 
+	pattern_Msg_ReserveAuthority_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"cerc", "registry", "v1", "reserve_authority"}, "", runtime.AssumeColonVerbOpt(false)))
+
 	pattern_Msg_SetAuthorityBond_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"cerc", "registry", "v1", "set_authority_bond"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
@@ -910,9 +910,9 @@ var (
 
 	forward_Msg_SetName_0 = runtime.ForwardResponseMessage
 
-	forward_Msg_ReserveName_0 = runtime.ForwardResponseMessage
-
 	forward_Msg_DeleteName_0 = runtime.ForwardResponseMessage
 
+	forward_Msg_ReserveAuthority_0 = runtime.ForwardResponseMessage
+
 	forward_Msg_SetAuthorityBond_0 = runtime.ForwardResponseMessage
 )