Merge branch 'uniformize-imports-format-14' into 'master'

Unifomrizing imports

Closes #14

See merge request !92

dfssc/security/files.go

@@ -7,12 +7,13 @@ import (
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
-	"dfss/auth"
-	"dfss/dfssc/common"
 	"encoding/base64"
 	"fmt"
 	"io"
 	"strings"
+
+	"dfss/auth"
+	"dfss/dfssc/common"
 )
 
 // GetCertificate return the Certificate stored on the disk

dfssc/security/request.go

@@ -3,10 +3,10 @@ package security
 
 import (
 	"crypto/rsa"
-	"dfss/auth"
-	"dfss/dfssc/common"
 	"fmt"
 
+	"dfss/auth"
+	"dfss/dfssc/common"
 	"github.com/spf13/viper"
 )
 

dfssc/security/security_test.go

 package security
 
 import (
-	"dfss/dfssc/common"
 	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
 
+	"dfss/dfssc/common"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )

dfssc/sign/create_test.go

@@ -10,7 +10,6 @@ import (
 
 	"dfss/auth"
 	"dfss/mockp/server"
-
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )

dfssc/user/authentication.go

 package user
 
 import (
+	"errors"
 	"io/ioutil"
 	"regexp"
 	"time"
 
-	"github.com/spf13/viper"
-
 	"dfss/dfssc/common"
 	"dfss/dfssc/security"
 	pb "dfss/dfssp/api"
 	"dfss/net"
-	"errors"
-
+	"github.com/spf13/viper"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )

dfssc/user/authentication_test.go

 package user
 
 import (
-	"dfss/dfssc/common"
 	"fmt"
 	"os"
 	"testing"
 
+	"dfss/dfssc/common"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )

dfssc/user/client.go

@@ -6,7 +6,6 @@ import (
 	"dfss/dfssc/security"
 	pb "dfss/dfssp/api"
 	"dfss/net"
-
 	"github.com/spf13/viper"
 )
 

dfssc/user/config.go

 package user
 
 import (
-	"dfss/auth"
-	"dfss/dfssc/common"
-	"dfss/dfssc/security"
 	"encoding/json"
 	"fmt"
 
+	"dfss/auth"
+	"dfss/dfssc/common"
+	"dfss/dfssc/security"
 	"github.com/spf13/viper"
 )
 

dfssc/user/config_test.go

 package user
 
 import (
-	"dfss/dfssc/common"
-	"dfss/dfssc/security"
 	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
 
+	"dfss/dfssc/common"
+	"dfss/dfssc/security"
 	"github.com/stretchr/testify/assert"
 )
 

dfssc/user/register_test.go

 package user
 
 import (
-	"dfss/auth"
-	"dfss/dfssc/common"
-	"dfss/dfssc/security"
-	"dfss/mockp/server"
 	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
 	"time"
 
+	"dfss/auth"
+	"dfss/dfssc/common"
+	"dfss/dfssc/security"
+	"dfss/mockp/server"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )

dfssc/user/unregister.go

@@ -3,11 +3,10 @@ package user
 import (
 	"errors"
 
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-
 	pb "dfss/dfssp/api"
 	"dfss/net"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
 )
 
 // Unregister a user from the platform

dfssp/authority/rootCA.go

@@ -8,9 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/spf13/viper"
-
 	"dfss/auth"
+	"github.com/spf13/viper"
 )
 
 // PlatformID contains platform private key and root certificate

dfssp/contract/contract_test.go

@@ -11,7 +11,6 @@ import (
 	"dfss/dfssp/server"
 	"dfss/mgdb"
 	"dfss/net"
-
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/mgo.v2/bson"

dfssp/contract/sequence_test.go

 package contract_test
 
 import (
+	"testing"
+
 	"dfss/dfssp/contract"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 var refSeq = []uint32{0, 1, 2, 0, 1, 2, 0, 1, 2} // for n = 3

dfssp/entities/contract.go

@@ -2,9 +2,9 @@
 package entities
 
 import (
-	"dfss/mgdb"
 	"time"
 
+	"dfss/mgdb"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 )

dfssp/entities/user.go

 package entities
 
 import (
-	"dfss/mgdb"
-
 	"time"
 
+	"dfss/mgdb"
 	"gopkg.in/mgo.v2/bson"
 )
 

dfssp/user/auth_test.go

 package user_test
 
 import (
-	"dfss/dfssp/api"
 	"testing"
 	"time"
 
+	"dfss/dfssp/api"
 	"dfss/dfssp/entities"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"

dfssp/user/create_test.go

 package user_test
 
 import (
-	"dfss/dfssp/api"
 	"testing"
 	"time"
 
+	"dfss/dfssp/api"
 	"dfss/dfssp/entities"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"

dfsst/entities/archivesManager.go

@@ -4,7 +4,6 @@ package entities
 import (
 	cAPI "dfss/dfssc/api"
 	"dfss/mgdb"
-
 	"gopkg.in/mgo.v2/bson"
 )
 

dfsst/entities/archivesManager_test.go

 package entities
 
 import (
+	"crypto/sha512"
 	"fmt"
 	"os"
 	"testing"
 
-	"crypto/sha512"
 	cAPI "dfss/dfssc/api"
 	"dfss/mgdb"
 	"github.com/stretchr/testify/assert"

dfsst/entities/check_request.go

@@ -2,9 +2,9 @@ package entities
 
 import (
 	"bytes"
+	"crypto/sha512"
 	"errors"
 
-	"crypto/sha512"
 	"dfss/auth"
 	cAPI "dfss/dfssc/api"
 	pAPI "dfss/dfssp/api"

dfsst/resolve/resolve_test.go

 package resolve
 
 import (
+	"crypto/sha512"
 	"fmt"
 	"os"
 	"testing"
 
-	"crypto/sha512"
 	cAPI "dfss/dfssc/api"
 	"dfss/dfsst/entities"
 	"dfss/mgdb"

dfsst/server/server_test.go

@@ -10,12 +10,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/spf13/viper"
-
 	"dfss/auth"
 	"dfss/dfsst/entities"
 	"dfss/mgdb"
-
+	"github.com/spf13/viper"
 	"gopkg.in/mgo.v2/bson"
 )
 

gui/userform/userform.go

@@ -7,7 +7,6 @@ import (
 	"dfss/dfssc/user"
 	"dfss/gui/common"
 	"dfss/gui/config"
-
 	"github.com/spf13/viper"
 	"github.com/visualfc/goqt/ui"
 )

mgdb/manager_test.go

@@ -2,9 +2,10 @@ package mgdb
 
 import (
 	"fmt"
-	"gopkg.in/mgo.v2/bson"
 	"os"
 	"testing"
+
+	"gopkg.in/mgo.v2/bson"
 )
 
 type card struct {

mockp/fixtures/authentication.go

 package fixtures
 
 import (
-	pb "dfss/dfssp/api"
+	"dfss/dfssp/api"
 )
 
 // AuthFixture holds the fixture for the Auth route
-var AuthFixture = map[string]*pb.RegisteredUser{
-	"default": &pb.RegisteredUser{ClientCert: "default"},
+var AuthFixture = map[string]*api.RegisteredUser{
+	"default": &api.RegisteredUser{ClientCert: "default"},
 }

mockp/server/server.go

@@ -9,7 +9,6 @@ import (
 	"dfss/dfssp/api"
 	"dfss/mockp/fixtures"
 	"dfss/net"
-
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )

tests/impexp_test.go

 package tests
 
 import (
-	"dfss/dfssc/common"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -9,6 +8,7 @@ import (
 	"strings"
 	"testing"
 
+	"dfss/dfssc/common"
 	"github.com/stretchr/testify/assert"
 )