highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-06-13 10:21:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

lnrpc: extract sendtoroute unmarshall to method

Browse Source
This commit is contained in:
Joost Jager 2019-01-21 12:50:36 +01:00
parent 5d33d7226c
commit 5a4951affd
No known key found for this signature in database
GPG Key ID: A61B9D4C393C59C7
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
rpcserver.go
View File

@ -2565,13 +2565,28 @@ func (r *rpcServer) SendToRoute(stream lnrpc.Lightning_SendToRouteServer) error
graph := r.server.chanDB.ChannelGraph() graph := r.server.chanDB.ChannelGraph()
return unmarshallSendToRouteRequest(req, graph)
},
send: func(r *lnrpc.SendResponse) error {
// Calling stream.Send concurrently is not safe.
lock.Lock()
defer lock.Unlock()
return stream.Send(r)
},
})
}
// unmarshallSendToRouteRequest unmarshalls an rpc sendtoroute request
func unmarshallSendToRouteRequest(req *lnrpc.SendToRouteRequest,
graph *channeldb.ChannelGraph) (*rpcPaymentRequest, error) {
if len(req.Routes) == 0 { if len(req.Routes) == 0 {
return nil, fmt.Errorf("unable to send, no routes provided") return nil, fmt.Errorf("unable to send, no routes provided")
} }
routes := make([]*routing.Route, len(req.Routes)) routes := make([]*routing.Route, len(req.Routes))
for i, rpcroute := range req.Routes { for i, rpcroute := range req.Routes {
route, err := r.unmarshallRoute(rpcroute, graph) route, err := unmarshallRoute(rpcroute, graph)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -2584,14 +2599,6 @@ func (r *rpcServer) SendToRoute(stream lnrpc.Lightning_SendToRouteServer) error
}, },
routes: routes, routes: routes,
}, nil }, nil
},
send: func(r *lnrpc.SendResponse) error {
// Calling stream.Send concurrently is not safe.
lock.Lock()
defer lock.Unlock()
return stream.Send(r)
},
})
} }
// rpcPaymentIntent is a small wrapper struct around the of values we can // rpcPaymentIntent is a small wrapper struct around the of values we can
@ -3027,21 +3034,12 @@ func (r *rpcServer) SendToRouteSync(ctx context.Context,
graph := r.server.chanDB.ChannelGraph() graph := r.server.chanDB.ChannelGraph()
routes := make([]*routing.Route, len(req.Routes)) paymentRequest, err := unmarshallSendToRouteRequest(req, graph)
for i, route := range req.Routes {
route, err := r.unmarshallRoute(route, graph)
if err != nil { if err != nil {
return nil, err return nil, err
} }
routes[i] = route
}
return r.sendPaymentSync(ctx, &rpcPaymentRequest{ return r.sendPaymentSync(ctx, paymentRequest)
SendRequest: &lnrpc.SendRequest{
PaymentHashString: req.PaymentHashString,
},
routes: routes,
})
} }
// sendPaymentSync is the synchronous variant of sendPayment. It will block and // sendPaymentSync is the synchronous variant of sendPayment. It will block and
@ -4024,7 +4022,7 @@ func unmarshallHop(graph *channeldb.ChannelGraph, hop *lnrpc.Hop,
// unmarshallRoute unmarshalls an rpc route. For hops that don't specify a // unmarshallRoute unmarshalls an rpc route. For hops that don't specify a
// pubkey, the channel graph is queried. // pubkey, the channel graph is queried.
func (r *rpcServer) unmarshallRoute(rpcroute *lnrpc.Route, func unmarshallRoute(rpcroute *lnrpc.Route,
graph *channeldb.ChannelGraph) (*routing.Route, error) { graph *channeldb.ChannelGraph) (*routing.Route, error) {
sourceNode, err := graph.SourceNode() sourceNode, err := graph.SourceNode()