aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorRyan W <twentybitdev@gmail.com>2021-09-08 17:31:03 +0100
committerGitHub <noreply@github.com>2021-09-08 17:31:03 +0100
commita624eab309ee6ee7b3540dfba884a42c9a4f4ad9 (patch)
tree92ec39ba2d0f512891dcb20635ee9bc660b45b18 /cmd
parent7dc8fb1fe780888d5758bf665949e9e09d21e56a (diff)
- Removed double imports (#1989)
- Lower cased error messages Signed-off-by: Ryan Whittington <twentybitdev@gmail.com> Co-authored-by: kegsay <kegan@matrix.org>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/dendrite-demo-pinecone/main.go3
-rw-r--r--cmd/dendrite-upgrade-tests/main.go2
2 files changed, 2 insertions, 3 deletions
diff --git a/cmd/dendrite-demo-pinecone/main.go b/cmd/dendrite-demo-pinecone/main.go
index 1933c5ad..e919e749 100644
--- a/cmd/dendrite-demo-pinecone/main.go
+++ b/cmd/dendrite-demo-pinecone/main.go
@@ -49,7 +49,6 @@ import (
"github.com/matrix-org/gomatrixserverlib"
pineconeMulticast "github.com/matrix-org/pinecone/multicast"
- "github.com/matrix-org/pinecone/router"
pineconeRouter "github.com/matrix-org/pinecone/router"
pineconeSessions "github.com/matrix-org/pinecone/sessions"
@@ -125,7 +124,7 @@ func main() {
connectToStaticPeer := func() {
attempt := func() {
- if pRouter.PeerCount(router.PeerTypeRemote) == 0 {
+ if pRouter.PeerCount(pineconeRouter.PeerTypeRemote) == 0 {
uri := *instancePeer
if uri == "" {
return
diff --git a/cmd/dendrite-upgrade-tests/main.go b/cmd/dendrite-upgrade-tests/main.go
index a6cc2d3f..aa8c7fdc 100644
--- a/cmd/dendrite-upgrade-tests/main.go
+++ b/cmd/dendrite-upgrade-tests/main.go
@@ -148,7 +148,7 @@ func buildDendrite(httpClient *http.Client, dockerClient *client.Client, tmpDir,
// add top level Dockerfile
err = ioutil.WriteFile(path.Join(*flagHead, "Dockerfile"), []byte(Dockerfile), os.ModePerm)
if err != nil {
- return "", fmt.Errorf("Custom HEAD: failed to inject /Dockerfile: %w", err)
+ return "", fmt.Errorf("custom HEAD: failed to inject /Dockerfile: %w", err)
}
// now tarball it
var buffer bytes.Buffer