multi: makes switches exhaustive or simplify

Author: jharveyb

asset/mock.go

@@ -270,6 +270,8 @@ func SignOutputRaw(priv *btcec.PrivateKey, tx *wire.MsgTx,
 			signDesc.Output.Value, signDesc.Output.PkScript,
 			leaf, signDesc.HashType, privKey,
 		)
+	default:
+		// A witness V0 sign method should never appear here.
 	}
 	if err != nil {
 		return nil, err

cmd/tapcli/addrs.go

@@ -64,8 +64,7 @@ var newAddrCommand = cli.Command{
 }
 
 func newAddr(ctx *cli.Context) error {
-	switch {
-	case ctx.String(assetIDName) == "":
+	if ctx.String(assetIDName) == "" {
 		return cli.ShowSubcommandHelp(ctx)
 	}
 

cmd/tapcli/proofs.go

@@ -59,8 +59,7 @@ var verifyProofCommand = cli.Command{
 }
 
 func verifyProof(ctx *cli.Context) error {
-	switch {
-	case ctx.String(proofPathName) == "":
+	if ctx.String(proofPathName) == "" {
 		return cli.ShowSubcommandHelp(ctx)
 	}
 
@@ -126,8 +125,7 @@ func decodeProof(ctx *cli.Context) error {
 	client, cleanUp := getClient(ctx)
 	defer cleanUp()
 
-	switch {
-	case !ctx.IsSet(proofPathName):
+	if !ctx.IsSet(proofPathName) {
 		_ = cli.ShowCommandHelp(ctx, "decode")
 		return nil
 	}
@@ -176,8 +174,7 @@ var verifyOwnershipCommand = cli.Command{
 }
 
 func verifyOwnershipProof(ctx *cli.Context) error {
-	switch {
-	case ctx.String(proofPathName) == "":
+	if ctx.String(proofPathName) == "" {
 		return cli.ShowSubcommandHelp(ctx)
 	}
 

cmd/tapcli/universe.go

@@ -516,8 +516,7 @@ var universeProofInsertInsert = cli.Command{
 }
 
 func universeProofInsert(ctx *cli.Context) error {
-	switch {
-	case ctx.String(proofPathName) == "":
+	if ctx.String(proofPathName) == "" {
 		return cli.ShowSubcommandHelp(ctx)
 	}
 
@@ -617,8 +616,7 @@ var universeSyncCommand = cli.Command{
 }
 
 func universeSync(ctx *cli.Context) error {
-	switch {
-	case ctx.String(universeHostName) == "":
+	if ctx.String(universeHostName) == "" {
 		return cli.ShowSubcommandHelp(ctx)
 	}
 
@@ -721,8 +719,7 @@ var universeFederationAddCommand = cli.Command{
 }
 
 func universeFederationAdd(ctx *cli.Context) error {
-	switch {
-	case ctx.String(universeHostName) == "":
+	if ctx.String(universeHostName) == "" {
 		return cli.ShowSubcommandHelp(ctx)
 	}
 
@@ -771,9 +768,9 @@ var universeFederationDelCommand = cli.Command{
 }
 
 func universeFederationDel(ctx *cli.Context) error {
-	switch {
-	case ctx.String(universeHostName) == "" &&
-		ctx.Int(universeServerID) == 0:
+	if ctx.String(universeHostName) == "" &&
+		ctx.Int(universeServerID) == 0 {
+
 		return cli.ShowSubcommandHelp(ctx)
 	}
 

commitment/commitment_test.go

@@ -450,15 +450,16 @@ func TestMintAndDeriveTapCommitment(t *testing.T) {
 
 			var tapCommitment *TapCommitment
 
-			if includesAsset && includesAssetGroup {
+			switch {
+			case includesAsset && includesAssetGroup:
 				tapCommitment, err = proof.DeriveByAssetInclusion(
 					asset,
 				)
-			} else if includesAssetGroup {
+			case !includesAsset && includesAssetGroup:
 				tapCommitment, err = proof.DeriveByAssetExclusion(
 					asset.AssetCommitmentKey(),
 				)
-			} else {
+			case !includesAsset && !includesAssetGroup:
 				tapCommitment, err = proof.DeriveByAssetCommitmentExclusion(
 					asset.TapCommitmentKey(),
 				)

itest/send_test.go

@@ -54,20 +54,9 @@ func testBasicSendUnidirectional(t *harnessTest) {
 
 		broadcastState := tapfreighter.SendStateBroadcast.String()
 		targetEventSelector := func(event *taprpc.SendAssetEvent) bool {
-			switch eventTyped := event.Event.(type) {
-			case *taprpc.SendAssetEvent_ExecuteSendStateEvent:
-				ev := eventTyped.ExecuteSendStateEvent
-
-				// Log send state execution.
-				timestamp := time.UnixMicro(ev.Timestamp)
-				t.Logf("Executing send state (%v): %v",
-					timestamp.Format(time.RFC3339Nano),
-					ev.SendState)
-
-				return ev.SendState == broadcastState
-			}
-
-			return false
+			return AssertSendEventExecuteSendState(
+				t, event, broadcastState,
+			)
 		}
 
 		timeout := 2 * defaultProofTransferReceiverAckTimeout
@@ -168,20 +157,9 @@ func testRestartReceiverCheckBalance(t *harnessTest) {
 
 		broadcastState := tapfreighter.SendStateBroadcast.String()
 		targetEventSelector := func(event *taprpc.SendAssetEvent) bool {
-			switch eventTyped := event.Event.(type) {
-			case *taprpc.SendAssetEvent_ExecuteSendStateEvent:
-				ev := eventTyped.ExecuteSendStateEvent
-
-				// Log send state execution.
-				timestamp := time.UnixMicro(ev.Timestamp)
-				t.Logf("Executing send state (%v): %v",
-					timestamp.Format(time.RFC3339Nano),
-					ev.SendState)
-
-				return ev.SendState == broadcastState
-			}
-
-			return false
+			return AssertSendEventExecuteSendState(
+				t, event, broadcastState,
+			)
 		}
 
 		timeout := 2 * defaultProofTransferReceiverAckTimeout
@@ -620,18 +598,9 @@ func testReattemptFailedSendHashmailCourier(t *harnessTest) {
 		// Define a target event selector to match the backoff wait
 		// event. This function selects for a specific event type.
 		targetEventSelector := func(event *taprpc.SendAssetEvent) bool {
-			switch eventTyped := event.Event.(type) {
-			case *taprpc.SendAssetEvent_ProofTransferBackoffWaitEvent:
-				ev := eventTyped.ProofTransferBackoffWaitEvent
-				if ev.TransferType != transferTypeSend {
-					return false
-				}
-
-				t.Logf("Found event ntfs: %v", ev)
-				return true
-			}
-
-			return false
+			return AssertSendEventProofTransferBackoffWaitTypeSend(
+				t, event,
+			)
 		}
 
 		// Expected number of events is one less than the number of
@@ -727,18 +696,9 @@ func testReattemptFailedSendUniCourier(t *harnessTest) {
 		// Define a target event selector to match the backoff wait
 		// event. This function selects for a specific event type.
 		targetEventSelector := func(event *taprpc.SendAssetEvent) bool {
-			switch eventTyped := event.Event.(type) {
-			case *taprpc.SendAssetEvent_ProofTransferBackoffWaitEvent:
-				ev := eventTyped.ProofTransferBackoffWaitEvent
-				if ev.TransferType != transferTypeSend {
-					return false
-				}
-
-				t.Logf("Found event ntfs: %v", ev)
-				return true
-			}
-
-			return false
+			return AssertSendEventProofTransferBackoffWaitTypeSend(
+				t, event,
+			)
 		}
 
 		// Expected number of events is one less than the number of
@@ -889,22 +849,21 @@ func testReattemptFailedReceiveUniCourier(t *harnessTest) {
 	// Define a target event selector to match the backoff wait event. This
 	// function selects for a specific event type.
 	targetEventSelector := func(event *taprpc.ReceiveAssetEvent) bool {
-		switch eventTyped := event.Event.(type) {
-		case *taprpc.ReceiveAssetEvent_ProofTransferBackoffWaitEvent:
-			ev := eventTyped.ProofTransferBackoffWaitEvent
-
-			// We are attempting to identify receive transfer types.
-			// Skip the event if it is not a receiving transfer
-			// type.
-			if ev.TransferType != taprpc.ProofTransferType_PROOF_TRANSFER_TYPE_RECEIVE {
-				return false
-			}
+		ev := event.GetProofTransferBackoffWaitEvent()
+		if ev == nil {
+			return false
+		}
 
-			t.Logf("Found event ntfs: %v", ev)
-			return true
+		// We are attempting to identify receive transfer types.
+		// Skip the event if it is not a receiving transfer
+		// type.
+		typeRecv := taprpc.ProofTransferType_PROOF_TRANSFER_TYPE_RECEIVE
+		if ev.TransferType != typeRecv {
+			return false
 		}
 
-		return false
+		t.Logf("Found event ntfs: %v", ev)
+		return true
 	}
 
 	// Expected minimum number of events to receive.
@@ -996,23 +955,12 @@ func testOfflineReceiverEventuallyReceives(t *harnessTest) {
 		// Define a target event selector to match the backoff wait
 		// event. This function selects for a specific event type.
 		targetEventSelector := func(event *taprpc.SendAssetEvent) bool {
-			switch eventTyped := event.Event.(type) {
-			case *taprpc.SendAssetEvent_ProofTransferBackoffWaitEvent:
-				ev := eventTyped.ProofTransferBackoffWaitEvent
-
-				// We're listening for events on the sender
-				// node. We therefore expect to receive
-				// deliver transfer type backoff wait events
-				// for sending transfers.
-				if ev.TransferType != transferTypeSend {
-					return false
-				}
-
-				t.Logf("Found event ntfs: %v", ev)
-				return true
-			}
-
-			return false
+			// We're listening for events on the sender node. We
+			// therefore expect to receive deliver transfer type
+			// backoff wait events for sending transfers.
+			return AssertSendEventProofTransferBackoffWaitTypeSend(
+				t, event,
+			)
 		}
 
 		// Lower bound number of proof delivery attempts.

itest/utils.go

@@ -60,6 +60,47 @@ func ParseGenInfo(t *testing.T, genInfo *taprpc.GenesisInfo) *asset.Genesis {
 	return &parsedGenesis
 }
 
+// AssertSendEventExecuteSendState asserts that the send asset event is an
+// ExecuteSendState event, and logs the event timestamp if so.
+func AssertSendEventExecuteSendState(t *harnessTest,
+	event *taprpc.SendAssetEvent, broadcastState string) bool {
+
+	ev := event.GetExecuteSendStateEvent()
+	if ev == nil {
+		return false
+	}
+
+	// Log send state execution.
+	timestamp := time.UnixMicro(ev.Timestamp)
+	t.Logf("Executing send state (%v): %v",
+		timestamp.Format(time.RFC3339Nano),
+		ev.SendState)
+
+	return ev.SendState == broadcastState
+}
+
+// AssertSendEventProofTransferBackoffWait asserts that the send asset event is
+// a ProofTransferBackoffWait event, with the transfer type set as send.
+func AssertSendEventProofTransferBackoffWaitTypeSend(t *harnessTest,
+	event *taprpc.SendAssetEvent) bool {
+
+	ev := event.GetProofTransferBackoffWaitEvent()
+	if ev == nil {
+		return false
+	}
+
+	// We're listening for events on the sender node. We therefore expect to
+	// receive deliver transfer type backoff wait events for sending
+	// transfers.
+	typeSend := taprpc.ProofTransferType_PROOF_TRANSFER_TYPE_SEND
+	if ev.TransferType != typeSend {
+		return false
+	}
+
+	t.Logf("Found event ntfs: %v", ev)
+	return true
+}
+
 // MineBlocks mine 'num' of blocks and check that blocks are present in
 // node blockchain. numTxs should be set to the number of transactions
 // (excluding the coinbase) we expect to be included in the first mined block.

mssmt/tree_test.go

@@ -68,8 +68,8 @@ func genTestStores(t *testing.T) map[string]makeTestTreeStoreFunc {
 }
 
 func printStoreStats(t *testing.T, store mssmt.TreeStore) {
-	switch s := store.(type) {
-	case *mssmt.DefaultStore:
+	s, ok := store.(*mssmt.DefaultStore)
+	if ok {
 		t.Logf("%s: %s", t.Name(), s.Stats())
 	}
 }

proof/tx.go

@@ -62,12 +62,13 @@ func NewTxMerkleProof(txs []*wire.MsgTx, txIdx int) (*TxMerkleProof, error) {
 			// If we are the left child, a right sibling may not
 			// exist.
 			hash := hashes[currentIdx+1]
-			if hash != nil {
+			switch {
+			case hash != nil:
 				sibling = *hash
-			} else if hashes[currentIdx] == nil {
-				return nil, errors.New("invalid merkle tree")
-			} else {
+			case hashes[currentIdx] != nil:
 				sibling = *hashes[currentIdx]
+			default:
+				return nil, errors.New("invalid merkle tree")
 			}
 		} else {
 			// If we are the right child, there'll always be a left

rfq/manager.go

@@ -296,8 +296,8 @@ func (m *Manager) handleIncomingMessage(incomingMsg rfqmsg.IncomingMsg) error {
 // messages that will be sent to a peer.
 func (m *Manager) handleOutgoingMessage(outgoingMsg rfqmsg.OutgoingMsg) error {
 	// Perform type specific handling of the outgoing message.
-	switch msg := outgoingMsg.(type) {
-	case *rfqmsg.Accept:
+	msg, ok := outgoingMsg.(*rfqmsg.Accept)
+	if ok {
 		// Before sending an accept message to a peer, inform the HTLC
 		// order handler that we've accepted the quote request.
 		m.orderHandler.RegisterChannelRemit(*msg)

rpcserver.go

@@ -720,8 +720,7 @@ func (r *rpcServer) checkBalanceOverflow(ctx context.Context,
 func (r *rpcServer) ListAssets(ctx context.Context,
 	req *taprpc.ListAssetRequest) (*taprpc.ListAssetResponse, error) {
 
-	switch {
-	case req.IncludeSpent && req.IncludeLeased:
+	if req.IncludeSpent && req.IncludeLeased {
 		return nil, fmt.Errorf("cannot specify both include_spent " +
 			"and include_leased")
 	}

tapdb/migrations.go

@@ -59,6 +59,7 @@ func (m *migrationLogger) Printf(format string, v ...interface{}) {
 		m.log.Errorf(format, v...)
 	case btclog.LevelCritical:
 		m.log.Criticalf(format, v...)
+	case btclog.LevelOff:
 	}
 }