rfq+rpcserver: rename helper methods/structs for readability

We rename some of the existing structures or helper methods to be
shorter and more directly indicate their purpose.

Author: GeorgeTsagk

rfq/manager.go

@@ -553,7 +553,7 @@ func (m *Manager) addScidAlias(scidAlias uint64, assetSpecifier asset.Specifier,
 	peer route.Vertex) error {
 
 	ctxb := context.Background()
-	peerChans, err := m.RfqChannel(
+	peerChans, err := m.FetchChannel(
 		ctxb, assetSpecifier, &peer, NoIntention,
 	)
 	if err != nil && !strings.Contains(
@@ -568,7 +568,7 @@ func (m *Manager) addScidAlias(scidAlias uint64, assetSpecifier asset.Specifier,
 	// is okay, because non-strict forwarding will ask each channel if the
 	// bandwidth matches the provided specifier.
 	if len(peerChans[peer]) == 0 {
-		peerChans, err = m.RfqChannel(
+		peerChans, err = m.FetchChannel(
 			ctxb, asset.Specifier{}, &peer, NoIntention,
 		)
 		if err != nil {
@@ -1033,10 +1033,10 @@ func (m *Manager) ChannelMatchesFully(ctx context.Context,
 	return true, nil
 }
 
-// ChannelWithSpecifier is a helper struct that combines the information of an
-// asset specifier that is satisfied by a channel with the channels' general
+// TapChannel is a helper struct that combines the information of an asset
+// specifier that is satisfied by a channel with the channels' general
 // information.
-type ChannelWithSpecifier struct {
+type TapChannel struct {
 	// Specifier is the asset Specifier that is satisfied by this channels'
 	// assets.
 	Specifier asset.Specifier
@@ -1051,11 +1051,11 @@ type ChannelWithSpecifier struct {
 
 // PeerChanMap is a structure that maps peers to channels. This is used for
 // filtering asset channels against an asset specifier.
-type PeerChanMap map[route.Vertex][]ChannelWithSpecifier
+type PeerChanMap map[route.Vertex][]TapChannel
 
-// ComputeCompatibleChannelAssetBalance computes the total local and remote
-// balance for each asset channel that matches the provided asset specifier.
-func (m *Manager) ComputeCompatibleChannelAssetBalance(ctx context.Context,
+// ComputeChannelAssetBalance computes the total local and remote balance for
+// each asset channel that matches the provided asset specifier.
+func (m *Manager) ComputeChannelAssetBalance(ctx context.Context,
 	activeChannels []lndclient.ChannelInfo,
 	specifier asset.Specifier) (PeerChanMap, bool, error) {
 
@@ -1106,7 +1106,7 @@ func (m *Manager) ComputeCompatibleChannelAssetBalance(ctx context.Context,
 		if pass || !specifier.IsSome() {
 			peerChanMap[openChan.PubKeyBytes] = append(
 				peerChanMap[openChan.PubKeyBytes],
-				ChannelWithSpecifier{
+				TapChannel{
 					Specifier:   specifier,
 					ChannelInfo: openChan,
 					AssetInfo:   assetData,
@@ -1135,10 +1135,10 @@ const (
 	ReceiveIntention
 )
 
-// RfqChannel returns the channel to use for RFQ operations. It returns a map of
-// peers and their eligible channels. If a peerPubKey is specified then the map
-// will only contain one entry for that peer.
-func (m *Manager) RfqChannel(ctx context.Context, specifier asset.Specifier,
+// FetchChannel returns the channel to use for RFQ operations. It returns a map
+// of peers and their eligible channels. If a peerPubKey is specified then the
+// map will only contain one entry for that peer.
+func (m *Manager) FetchChannel(ctx context.Context, specifier asset.Specifier,
 	peerPubKey *route.Vertex,
 	intention ChanIntention) (PeerChanMap, error) {
 
@@ -1149,8 +1149,7 @@ func (m *Manager) RfqChannel(ctx context.Context, specifier asset.Specifier,
 		return nil, err
 	}
 
-	// nolint:lll
-	balancesMap, haveGroupChans, err := m.ComputeCompatibleChannelAssetBalance(
+	balancesMap, haveGroupChans, err := m.ComputeChannelAssetBalance(
 		ctx, activeChannels, specifier,
 	)
 	if err != nil {

rfq/manager_test.go

@@ -149,7 +149,7 @@ func assertComputeChannelAssetBalance(t *testing.T,
 	)
 	defer cancel()
 
-	chanMap, _, err := manager.ComputeCompatibleChannelAssetBalance(
+	chanMap, _, err := manager.ComputeChannelAssetBalance(
 		ctxt, tc.activeChannels, tc.specifier,
 	)
 	require.NoError(t, err)

rpcserver.go

@@ -6934,7 +6934,7 @@ func (r *rpcServer) checkPeerChannel(ctx context.Context, peer route.Vertex,
 		// If we don't get an error here, it means we do have an asset
 		// channel with the peer. The intention doesn't matter as we're
 		// just checking whether a channel exists.
-		_, err := r.cfg.RfqManager.RfqChannel(
+		_, err := r.cfg.RfqManager.FetchChannel(
 			ctx, specifier, &peer, rfq.NoIntention,
 		)
 		if err != nil {
@@ -7641,7 +7641,7 @@ func (r *rpcServer) SendPayment(req *tchrpc.SendPaymentRequest,
 		rpcSpecifier := marshalAssetSpecifier(specifier)
 
 		// We can now query the asset channels we have.
-		chanMap, err := r.cfg.RfqManager.RfqChannel(
+		chanMap, err := r.cfg.RfqManager.FetchChannel(
 			ctx, specifier, peerPubKey, rfq.SendIntention,
 		)
 		if err != nil {
@@ -7776,7 +7776,7 @@ func (r *rpcServer) SendPayment(req *tchrpc.SendPaymentRequest,
 
 		// We check that we have the asset amount available in the
 		// channel.
-		_, err = r.cfg.RfqManager.RfqChannel(
+		_, err = r.cfg.RfqManager.FetchChannel(
 			ctx, specifier, &dest, rfq.SendIntention,
 		)
 		if err != nil {
@@ -8010,7 +8010,7 @@ func (r *rpcServer) AddInvoice(ctx context.Context,
 	}
 
 	// We can now query the asset channels we have.
-	chanMap, err := r.cfg.RfqManager.RfqChannel(
+	chanMap, err := r.cfg.RfqManager.FetchChannel(
 		ctx, specifier, peerPubKey, rfq.ReceiveIntention,
 	)
 	if err != nil {
@@ -8044,7 +8044,7 @@ func (r *rpcServer) AddInvoice(ctx context.Context,
 	type quoteWithInfo struct {
 		quote   *rfqrpc.PeerAcceptedBuyQuote
 		rate    *rfqmath.BigIntFixedPoint
-		channel rfq.ChannelWithSpecifier
+		channel rfq.TapChannel
 	}
 
 	var acquiredQuotes []quoteWithInfo