Merge branch 'v0.15.1-beta-6847' into v0.15.1-branch-rc2

Roasbeef · Roasbeef · commit e5e20a71bee4 · 2022-08-22T18:05:29.000-05:00
diff --git a/docs/release-notes/release-notes-0.15.1.md b/docs/release-notes/release-notes-0.15.1.md
@@ -164,6 +164,9 @@ default](https://github.com/lightningnetwork/lnd/pull/6810) in most cases.
 * [Remove `ScidAliasOptional` dependency on 
 `ExplicitChannelTypeOptional`](https://github.com/lightningnetwork/lnd/pull/6809)
 
+* [Add a default case](https://github.com/lightningnetwork/lnd/pull/6847) to the
+  Address Type switch statement in the `NewAddress` rpc server method.
+
 ## Code Health
 
 ### Code cleanup, refactor, typo fixes
diff --git a/rpcserver.go b/rpcserver.go
@@ -1542,6 +1542,9 @@ func (r *rpcServer) NewAddress(ctx context.Context,
 		if err != nil {
 			return nil, err
 		}
+
+	default:
+		return nil, fmt.Errorf("unknown address type: %v", in.Type)
 	}
 
 	rpcsLog.Debugf("[newaddress] account=%v type=%v addr=%v", account,

Original file line number	Diff line number	Diff line change
`@@ -1542,6 +1542,9 @@ func (r *rpcServer) NewAddress(ctx context.Context,`
`1542`	`1542`	`if err != nil {`
`1543`	`1543`	`return nil, err`
`1544`	`1544`	`}`
	`1545`	`+`
	`1546`	`+ default:`
	`1547`	`+ return nil, fmt.Errorf("unknown address type: %v", in.Type)`
`1545`	`1548`	`}`
`1546`	`1549`
`1547`	`1550`	`rpcsLog.Debugf("[newaddress] account=%v type=%v addr=%v", account,`