multi: always alias swapserverrpc import for use as a package #446
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Packages importing loop can't import this package without aliasing the import.
Packages importing loopd can't import 2x looprpc packages (in the form of swapserverrpc and looprpc). To get around this, we alias each import with a different name, starting with the client in this commit.
guggero
approved these changes
Dec 14, 2021
loopd/swapclient_server.go
Outdated
| clientrpc "github.com/lightninglabs/loop/looprpc" | ||
| "github.com/lightninglabs/loop/swap" | ||
| "github.com/lightninglabs/loop/swapserverrpc" | ||
| serverrpc "github.com/lightninglabs/loop/swapserverrpc" |
There was a problem hiding this comment.
Should we use looprpc here to look the same as in the first two commits? Or use serverrpc there as well?
There was a problem hiding this comment.
I thought the server import might get upset with 2x looprpc packages and one aliased with looprpc, but just tried it out and it's fine. Will update!
Packages importing loopd can't import 2x looprpc packages (in the form of swapserverrpc and looprpc). To get around this, we alias each import with a different name, updating the server in this commit.
carlaKC
force-pushed
the
alias-imports
branch
from
c826ff2 to
213f5c7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
looprpcpackage is used for client and server protos, despite their being in different directories (github.com/lightninglabs/loop/looprpcandgithub.com/lightninglabs/loop/swapserverrpc). This is required to maintain backwards compatibility, because the package is used as part of the URI in grpc.[1] Use of mismatched package path/names (eg, import path
github.com/lightninglabs/loop/swapserverrpcforlooprpcpackage) causes issues when loop is imported as a package (as is the case in the server's itests) - the import can't be found.[2] Likewise, the presence of two
looprpcpackages (as is the case inloopd/swapclient_server.go) also confuses modules when we importloopd(to runloopdas a package, rather than a standalone binary in itests).This PR updates loop to alias
swapserverrpcwithlooprpceverywhere to address [1] and uses distinct aliases inloopdto address [2].Pull Request Checklist
release_notes.mdif your PR contains major features, breaking changes or bugfixes