multi: fix conversions + unneeded lambdas

jharveyb · jharveyb · commit 8d991370b15f · 2024-03-04T14:40:22.000-05:00
diff --git a/asset/asset.go b/asset/asset.go
@@ -778,11 +778,7 @@ func (g *GroupKey) IsEqual(otherGroupKey *GroupKey) bool {
 		return false
 	}
 
-	return slices.EqualFunc(
-		g.Witness, otherGroupKey.Witness, func(a, b []byte) bool {
-			return bytes.Equal(a, b)
-		},
-	)
+	return slices.EqualFunc(g.Witness, otherGroupKey.Witness, bytes.Equal)
 }
 
 // IsEqualGroup returns true if this group key describes the same asset group
diff --git a/cmd/tapcli/addrs.go b/cmd/tapcli/addrs.go
@@ -162,7 +162,7 @@ func queryAddr(ctx *cli.Context) error {
 
 	addrs, err := client.QueryAddrs(ctxc, &taprpc.QueryAddrRequest{
 		CreatedAfter:  start,
-		CreatedBefore: int64(end),
+		CreatedBefore: end,
 		Limit:         int32(ctx.Int64(limitName)),
 		Offset:        int32(ctx.Int64(offsetName)),
 	})
diff --git a/commitment/taproot.go b/commitment/taproot.go
@@ -233,7 +233,7 @@ func (t *TapscriptPreimage) IsEmpty() bool {
 
 // Type returns the preimage type.
 func (t *TapscriptPreimage) Type() TapscriptPreimageType {
-	return TapscriptPreimageType(t.siblingType)
+	return t.siblingType
 }
 
 // TapHash returns the tap hash of this preimage according to its type.
diff --git a/itest/mint_batch_stress_test.go b/itest/mint_batch_stress_test.go
@@ -121,7 +121,7 @@ func mintBatchStressTest(
 
 	// Update the asset name and metadata to match an index.
 	incrementMintAsset := func(asset *mintrpc.MintAsset, ind int) {
-		asset.Name = asset.Name + strconv.Itoa(ind)
+		asset.Name += strconv.Itoa(ind)
 		binary.PutUvarint(metadataPrefix, uint64(ind))
 		copy(asset.AssetMeta.Data[0:metaPrefixSize], metadataPrefix)
 	}
diff --git a/itest/psbt_test.go b/itest/psbt_test.go
@@ -602,7 +602,7 @@ func runPsbtInteractiveSplitSendTest(ctxt context.Context, t *harnessTest,
 		// Swap the sender and receiver nodes starting at the second
 		// iteration.
 		if i > 0 {
-			sendAmt = sendAmt / 2
+			sendAmt /= 2
 			changeAmt = sendAmt
 			sender, receiver = receiver, sender
 			senderSum, receiverSum = receiverSum, senderSum
diff --git a/itest/universe_pagination_test.go b/itest/universe_pagination_test.go
@@ -88,7 +88,7 @@ func mintBatchAssetsTest(
 
 	// Update the asset name and metadata to match an index.
 	incrementMintAsset := func(asset *mintrpc.MintAsset, ind int) {
-		asset.Name = asset.Name + strconv.Itoa(ind)
+		asset.Name += strconv.Itoa(ind)
 		binary.PutUvarint(metadataPrefix, uint64(ind))
 		copy(asset.AssetMeta.Data[0:metaPrefixSize], metadataPrefix)
 	}
diff --git a/proof/tx.go b/proof/tx.go
@@ -89,7 +89,7 @@ func NewTxMerkleProof(txs []*wire.MsgTx, txIdx int) (*TxMerkleProof, error) {
 
 		// Update the currentIdx to reflect the next level in the tree.
 		// We divide by 2 since we always hash in pairs.
-		currentIdx = currentIdx / 2
+		currentIdx /= 2
 
 		// We've arrived at the root so our proof is complete.
 		if len(hashes) == 1 {
diff --git a/rpcserver.go b/rpcserver.go
@@ -817,7 +817,7 @@ func (r *rpcServer) listBalancesByAsset(ctx context.Context,
 
 		resp.AssetBalances[assetIDStr] = &taprpc.AssetBalance{
 			AssetGenesis: &taprpc.GenesisInfo{
-				Version:      int32(balance.Version),
+				Version:      balance.Version,
 				GenesisPoint: balance.GenesisPoint.String(),
 				AssetType:    taprpc.AssetType(balance.Type),
 				Name:         balance.Tag,
diff --git a/tapdb/addrs.go b/tapdb/addrs.go
@@ -288,7 +288,7 @@ func (t *TapAddressBook) InsertAddrs(ctx context.Context,
 					&addr.TaprootOutputKey,
 				),
 				Amount:           int64(addr.Amount),
-				AssetType:        int16(assetGen.AssetType),
+				AssetType:        assetGen.AssetType,
 				CreationTime:     addr.CreationTime.UTC(),
 				ProofCourierAddr: proofCourierAddrBytes,
 			})
diff --git a/tapdb/asset_minting.go b/tapdb/asset_minting.go
@@ -620,10 +620,8 @@ func fetchAssetSprouts(ctx context.Context, q PendingAssetStore,
 						Index: extractSqlInt32[uint32](
 							sprout.GroupKeyIndex,
 						),
-						Family: keychain.KeyFamily(
-							extractSqlInt32[keychain.KeyFamily](
-								sprout.GroupKeyFamily,
-							),
+						Family: extractSqlInt32[keychain.KeyFamily](
+							sprout.GroupKeyFamily,
 						),
 					},
 				},
diff --git a/tapdb/multiverse.go b/tapdb/multiverse.go
@@ -225,8 +225,8 @@ func newRootPageQuery(q universe.RootNodesQuery) rootPageQuery {
 		withAmountsById: q.WithAmountsById,
 		leafQuery: leafQuery{
 			sortDirection: q.SortDirection,
-			offset:        int32(q.Offset),
-			limit:         int32(q.Limit),
+			offset:        q.Offset,
+			limit:         q.Limit,
 		},
 	}
 }
@@ -401,8 +401,8 @@ type leafQuery struct {
 func newLeafQuery(q universe.UniverseLeafKeysQuery) leafQuery {
 	return leafQuery{
 		sortDirection: q.SortDirection,
-		offset:        int32(q.Offset),
-		limit:         int32(q.Limit),
+		offset:        q.Offset,
+		limit:         q.Limit,
 	}
 }
 
@@ -725,13 +725,13 @@ func (b *MultiverseStore) RootNodes(ctx context.Context,
 
 	params := sqlc.UniverseRootsParams{
 		SortDirection: sqlInt16(q.SortDirection),
-		NumOffset:     int32(q.Offset),
+		NumOffset:     q.Offset,
 		NumLimit: func() int32 {
 			if q.Limit == 0 {
 				return universe.MaxPageSize
 			}
 
-			return int32(q.Limit)
+			return q.Limit
 		}(),
 	}
 
diff --git a/tapdb/universe_federation.go b/tapdb/universe_federation.go
@@ -279,7 +279,7 @@ func (u *UniverseFederationDB) RemoveServers(ctx context.Context,
 			// host string instead. This avoids bugs where a user
 			// doesn't set the ID value, and we try to delete the
 			// very first server.
-			uniID := int64(a.ID)
+			uniID := a.ID
 			if a.HostStr() != "" {
 				uniID = -1
 			}
diff --git a/tapfreighter/wallet.go b/tapfreighter/wallet.go
@@ -333,7 +333,7 @@ func (s *CoinSelect) selectForAmount(minTotalAmount uint64,
 
 			// Keep track of the total amount of assets we've seen
 			// so far.
-			amountSum += uint64(anchoredCommitment.Asset.Amount)
+			amountSum += anchoredCommitment.Asset.Amount
 			if amountSum >= minTotalAmount {
 				// At this point a target min amount was
 				// specified and has been reached.
diff --git a/universe/auto_syncer.go b/universe/auto_syncer.go
@@ -141,9 +141,7 @@ func (f *FederationEnvoy) Start() error {
 		// Before we start the main goroutine, we'll add the set of
 		// static Universe servers.
 		addrs := f.cfg.StaticFederationMembers
-		serverAddrs := fn.Map(addrs, func(a string) ServerAddr {
-			return NewServerAddrFromStr(a)
-		})
+		serverAddrs := fn.Map(addrs, NewServerAddrFromStr)
 
 		serverAddrs = fn.Filter(serverAddrs, func(a ServerAddr) bool {
 			// Before we add the server as a federation member, we
diff --git a/universe_rpc_diff.go b/universe_rpc_diff.go
@@ -82,8 +82,8 @@ func (r *RpcUniverseDiff) RootNodes(ctx context.Context,
 	universeRoots, err := r.conn.AssetRoots(
 		ctx, &unirpc.AssetRootRequest{
 			WithAmountsById: q.WithAmountsById,
-			Offset:          int32(q.Offset),
-			Limit:           int32(q.Limit),
+			Offset:          q.Offset,
+			Limit:           q.Limit,
 			Direction:       unirpc.SortDirection(q.SortDirection),
 		},
 	)
@@ -133,8 +133,8 @@ func (r *RpcUniverseDiff) UniverseLeafKeys(ctx context.Context,
 		ctx, &unirpc.AssetLeafKeysRequest{
 			Id:        uniID,
 			Direction: unirpc.SortDirection(q.SortDirection),
-			Offset:    int32(q.Offset),
-			Limit:     int32(q.Limit),
+			Offset:    q.Offset,
+			Limit:     q.Limit,
 		},
 	)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -778,11 +778,7 @@ func (g GroupKey) IsEqual(otherGroupKey GroupKey) bool {`
`778`	`778`	`return false`
`779`	`779`	`}`
`780`	`780`
`781`		`- return slices.EqualFunc(`
`782`		`- g.Witness, otherGroupKey.Witness, func(a, b []byte) bool {`
`783`		`- return bytes.Equal(a, b)`
`784`		`- },`
`785`		`- )`
	`781`	`+ return slices.EqualFunc(g.Witness, otherGroupKey.Witness, bytes.Equal)`
`786`	`782`	`}`
`787`	`783`
`788`	`784`	`// IsEqualGroup returns true if this group key describes the same asset group`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ func (t *TapscriptPreimage) IsEmpty() bool {`
`233`	`233`
`234`	`234`	`// Type returns the preimage type.`
`235`	`235`	`func (t *TapscriptPreimage) Type() TapscriptPreimageType {`
`236`		`- return TapscriptPreimageType(t.siblingType)`
	`236`	`+ return t.siblingType`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`// TapHash returns the tap hash of this preimage according to its type.`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ func mintBatchStressTest(`
`121`	`121`
`122`	`122`	`// Update the asset name and metadata to match an index.`
`123`	`123`	`incrementMintAsset := func(asset *mintrpc.MintAsset, ind int) {`
`124`		`- asset.Name = asset.Name + strconv.Itoa(ind)`
	`124`	`+ asset.Name += strconv.Itoa(ind)`
`125`	`125`	`binary.PutUvarint(metadataPrefix, uint64(ind))`
`126`	`126`	`copy(asset.AssetMeta.Data[0:metaPrefixSize], metadataPrefix)`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func mintBatchAssetsTest(`
`88`	`88`
`89`	`89`	`// Update the asset name and metadata to match an index.`
`90`	`90`	`incrementMintAsset := func(asset *mintrpc.MintAsset, ind int) {`
`91`		`- asset.Name = asset.Name + strconv.Itoa(ind)`
	`91`	`+ asset.Name += strconv.Itoa(ind)`
`92`	`92`	`binary.PutUvarint(metadataPrefix, uint64(ind))`
`93`	`93`	`copy(asset.AssetMeta.Data[0:metaPrefixSize], metadataPrefix)`
`94`	`94`	`}`