multi: use same order for daemons everywhere

This is a pure code-moving commit to use the same order of
faraday->loop->pool everywhere we handle the damons.
Only for consistency's sake.

Author: guggero

config.go

@@ -367,13 +367,13 @@ func loadAndValidateConfig() (*Config, error) {
 	// (like the log or lnd options) as they will be taken from lnd's config
 	// struct. Others we want to force to be the same as lnd so the user
 	// doesn't have to set them manually, like the network for example.
-	if err := loopd.Validate(cfg.Loop); err != nil {
+	if err := faraday.ValidateConfig(cfg.Faraday); err != nil {
 		return nil, err
 	}
-	if err := pool.Validate(cfg.Pool); err != nil {
+	if err := loopd.Validate(cfg.Loop); err != nil {
 		return nil, err
 	}
-	if err := faraday.ValidateConfig(cfg.Faraday); err != nil {
+	if err := pool.Validate(cfg.Pool); err != nil {
 		return nil, err
 	}
 

rpc_proxy.go

@@ -107,8 +107,8 @@ func newRpcProxy(cfg *Config, validator macaroons.MacaroonValidator,
 //        v non-registered call                 |
 //    +---+----------------------+    +---------v----------+
 //    | director                 |    | local subserver    |
-//    +---+----------------------+    |  - loop            |
-//        |                           |  - faraday         |
+//    +---+----------------------+    |  - faraday         |
+//        |                           |  - loop            |
 //        v authenticated call        |  - pool            |
 //    +---+----------------------+    +--------------------+
 //    | lnd (remote or local)    |
@@ -398,20 +398,20 @@ func (p *rpcProxy) basicAuthToMacaroon(ctx context.Context,
 	case isLndURI(requestURI):
 		_, _, _, macPath = p.cfg.lndConnectParams()
 
-	case isLoopURI(requestURI):
-		if p.cfg.loopRemote {
-			macPath = p.cfg.Remote.Loop.MacaroonPath
-		} else {
-			macPath = p.cfg.Loop.MacaroonPath
-		}
-
 	case isFaradayURI(requestURI):
 		if p.cfg.faradayRemote {
 			macPath = p.cfg.Remote.Faraday.MacaroonPath
 		} else {
 			macPath = p.cfg.Faraday.MacaroonPath
 		}
 
+	case isLoopURI(requestURI):
+		if p.cfg.loopRemote {
+			macPath = p.cfg.Remote.Loop.MacaroonPath
+		} else {
+			macPath = p.cfg.Loop.MacaroonPath
+		}
+
 	case isPoolURI(requestURI):
 		if p.cfg.poolRemote {
 			macPath = p.cfg.Remote.Pool.MacaroonPath

terminal.go

@@ -403,37 +403,37 @@ func (g *LightningTerminal) ValidateMacaroon(ctx context.Context,
 	// process. Calls that we proxy to a remote host don't need to be
 	// checked as they'll have their own interceptor.
 	switch {
-	case isLoopURI(fullMethod):
+	case isFaradayURI(fullMethod):
 		// In remote mode we just pass through the request, the remote
 		// daemon will check the macaroon.
-		if g.cfg.loopRemote {
+		if g.cfg.faradayRemote {
 			return nil
 		}
 
-		if !g.loopStarted {
-			return fmt.Errorf("loop is not yet ready for " +
+		if !g.faradayStarted {
+			return fmt.Errorf("faraday is not yet ready for " +
 				"requests, lnd possibly still starting or " +
 				"syncing")
 		}
 
-		return g.loopServer.ValidateMacaroon(
+		return g.faradayServer.ValidateMacaroon(
 			ctx, requiredPermissions, fullMethod,
 		)
 
-	case isFaradayURI(fullMethod):
+	case isLoopURI(fullMethod):
 		// In remote mode we just pass through the request, the remote
 		// daemon will check the macaroon.
-		if g.cfg.faradayRemote {
+		if g.cfg.loopRemote {
 			return nil
 		}
 
-		if !g.faradayStarted {
-			return fmt.Errorf("faraday is not yet ready for " +
+		if !g.loopStarted {
+			return fmt.Errorf("loop is not yet ready for " +
 				"requests, lnd possibly still starting or " +
 				"syncing")
 		}
 
-		return g.faradayServer.ValidateMacaroon(
+		return g.loopServer.ValidateMacaroon(
 			ctx, requiredPermissions, fullMethod,
 		)
 
@@ -554,8 +554,8 @@ func (g *LightningTerminal) shutdown() error {
 //        v non-registered call                 |
 //    +---+----------------------+    +---------v----------+
 //    | director                 |    | local subserver    |
-//    +---+----------------------+    |  - loop            |
-//        |                           |  - faraday         |
+//    +---+----------------------+    |  - faraday         |
+//        |                           |  - loop            |
 //        v authenticated call        |  - pool            |
 //    +---+----------------------+    +--------------------+
 //    | lnd (remote or local)    |