lnrpc+rpcserver+lncli: rename RPC fields to previous JSON name

cmd/lncli/types.go

@@ -58,7 +58,7 @@ type Utxo struct {
 // printed in base64.
 func NewUtxoFromProto(utxo *lnrpc.Utxo) *Utxo {
 	return &Utxo{
-		Type:          utxo.Type,
+		Type:          utxo.AddressType,
 		Address:       utxo.Address,
 		AmountSat:     utxo.AmountSat,
 		PkScript:      utxo.PkScript,

lnrpc/rpc.proto

@@ -819,7 +819,7 @@ service Lightning {
 
 message Utxo {
     /// The type of address
-    AddressType type = 1;
+    AddressType address_type = 1;
 
     /// The address
     string address = 2;
@@ -2910,7 +2910,7 @@ message ChannelFeeReport {
     uint64 chan_id = 5 [jstype = JS_STRING];
 
     /// The channel that this fee report belongs to.
-    string chan_point = 1;
+    string channel_point = 1;
 
     /// The base fee charged regardless of the number of milli-satoshis sent.
     int64 base_fee_msat = 2;

lnrpc/rpc.swagger.json

@@ -2192,7 +2192,7 @@
           "format": "uint64",
           "description": "/ The short channel id that this fee report belongs to."
         },
-        "chan_point": {
+        "channel_point": {
           "type": "string",
           "description": "/ The channel that this fee report belongs to."
         },
@@ -4196,7 +4196,7 @@
     "lnrpcUtxo": {
       "type": "object",
       "properties": {
-        "type": {
+        "address_type": {
           "$ref": "#/definitions/lnrpcAddressType",
           "title": "/ The type of address"
         },

rpcserver.go

@@ -943,7 +943,7 @@ func (r *rpcServer) ListUnspent(ctx context.Context,
 		}
 
 		utxoResp := lnrpc.Utxo{
-			Type:          addrType,
+			AddressType:   addrType,
 			AmountSat:     int64(utxo.Value),
 			PkScript:      hex.EncodeToString(utxo.PkScript),
 			Outpoint:      outpoint,
@@ -5141,11 +5141,11 @@ func (r *rpcServer) FeeReport(ctx context.Context,
 
 		// TODO(roasbeef): also add stats for revenue for each channel
 		feeReports = append(feeReports, &lnrpc.ChannelFeeReport{
-			ChanId:      chanInfo.ChannelID,
-			ChanPoint:   chanInfo.ChannelPoint.String(),
-			BaseFeeMsat: int64(edgePolicy.FeeBaseMSat),
-			FeePerMil:   int64(feeRateFixedPoint),
-			FeeRate:     feeRate,
+			ChanId:       chanInfo.ChannelID,
+			ChannelPoint: chanInfo.ChannelPoint.String(),
+			BaseFeeMsat:  int64(edgePolicy.FeeBaseMSat),
+			FeePerMil:    int64(feeRateFixedPoint),
+			FeeRate:      feeRate,
 		})
 
 		return nil