From b84fc9b9387bafdc5e90c0115ce63769c5f65e9f Mon Sep 17 00:00:00 2001
From: Samuel Hawksby-Robinson <samuel@samyoul.com>
Date: Wed, 25 Nov 2020 11:39:01 +0000
Subject: [PATCH] Resolved more linting

---
 services/ext/api.go          |  2 +-
 services/ext/service.go      | 18 ++++++++----------
 services/wakuext/api_test.go |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/services/ext/api.go b/services/ext/api.go
index bbbcbc6e9..79c9386e1 100644
--- a/services/ext/api.go
+++ b/services/ext/api.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/status-im/status-go/images"
 	"math/big"
 	"time"
 
@@ -16,6 +15,7 @@ import (
 
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/eth-node/types"
+	"github.com/status-im/status-go/images"
 	"github.com/status-im/status-go/mailserver"
 	"github.com/status-im/status-go/protocol"
 	"github.com/status-im/status-go/protocol/common"
diff --git a/services/ext/service.go b/services/ext/service.go
index 5809daadd..1882a273e 100644
--- a/services/ext/service.go
+++ b/services/ext/service.go
@@ -4,14 +4,11 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"database/sql"
-	"github.com/status-im/status-go/multiaccounts"
 	"math/big"
 	"os"
 	"path/filepath"
 	"time"
 
-	"github.com/status-im/status-go/services/wallet"
-
 	"github.com/syndtr/goleveldb/leveldb"
 
 	commongethtypes "github.com/ethereum/go-ethereum/common"
@@ -24,19 +21,20 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/status-im/status-go/db"
-	"github.com/status-im/status-go/multiaccounts/accounts"
-	"github.com/status-im/status-go/params"
-	"github.com/status-im/status-go/services/ext/mailservers"
-	"github.com/status-im/status-go/signal"
-
-	"go.uber.org/zap"
-
 	coretypes "github.com/status-im/status-go/eth-node/core/types"
 	"github.com/status-im/status-go/eth-node/types"
+	"github.com/status-im/status-go/multiaccounts"
+	"github.com/status-im/status-go/multiaccounts/accounts"
+	"github.com/status-im/status-go/params"
 	"github.com/status-im/status-go/protocol"
 	"github.com/status-im/status-go/protocol/pushnotificationclient"
 	"github.com/status-im/status-go/protocol/pushnotificationserver"
 	"github.com/status-im/status-go/protocol/transport"
+	"github.com/status-im/status-go/services/ext/mailservers"
+	"github.com/status-im/status-go/services/wallet"
+	"github.com/status-im/status-go/signal"
+
+	"go.uber.org/zap"
 )
 
 const (
diff --git a/services/wakuext/api_test.go b/services/wakuext/api_test.go
index dff239d3d..2f3419ab0 100644
--- a/services/wakuext/api_test.go
+++ b/services/wakuext/api_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
-	"github.com/status-im/status-go/multiaccounts"
 	"io/ioutil"
 	"math"
 	"net"
@@ -28,6 +27,7 @@ import (
 	gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/eth-node/types"
+	"github.com/status-im/status-go/multiaccounts"
 	"github.com/status-im/status-go/params"
 	"github.com/status-im/status-go/services/ext"
 	"github.com/status-im/status-go/t/helpers"