Commit db3d8512 authored by Caro Axel's avatar Caro Axel

Unifomrizing imports

parent 3ee03370
Pipeline #2311 passed with stage
...@@ -7,12 +7,13 @@ import ( ...@@ -7,12 +7,13 @@ import (
"crypto/rand" "crypto/rand"
"crypto/rsa" "crypto/rsa"
"crypto/x509" "crypto/x509"
"dfss/auth"
"dfss/dfssc/common"
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"io" "io"
"strings" "strings"
"dfss/auth"
"dfss/dfssc/common"
) )
// GetCertificate return the Certificate stored on the disk // GetCertificate return the Certificate stored on the disk
......
...@@ -3,10 +3,10 @@ package security ...@@ -3,10 +3,10 @@ package security
import ( import (
"crypto/rsa" "crypto/rsa"
"dfss/auth"
"dfss/dfssc/common"
"fmt" "fmt"
"dfss/auth"
"dfss/dfssc/common"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
......
package security package security
import ( import (
"dfss/dfssc/common"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
"dfss/dfssc/common"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
......
...@@ -10,7 +10,6 @@ import ( ...@@ -10,7 +10,6 @@ import (
"dfss/auth" "dfss/auth"
"dfss/mockp/server" "dfss/mockp/server"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
......
package user package user
import ( import (
"errors"
"io/ioutil" "io/ioutil"
"regexp" "regexp"
"time" "time"
"github.com/spf13/viper"
"dfss/dfssc/common" "dfss/dfssc/common"
"dfss/dfssc/security" "dfss/dfssc/security"
pb "dfss/dfssp/api" pb "dfss/dfssp/api"
"dfss/net" "dfss/net"
"errors" "github.com/spf13/viper"
"golang.org/x/net/context" "golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
......
package user package user
import ( import (
"dfss/dfssc/common"
"fmt" "fmt"
"os" "os"
"testing" "testing"
"dfss/dfssc/common"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
......
...@@ -6,7 +6,6 @@ import ( ...@@ -6,7 +6,6 @@ import (
"dfss/dfssc/security" "dfss/dfssc/security"
pb "dfss/dfssp/api" pb "dfss/dfssp/api"
"dfss/net" "dfss/net"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
......
package user package user
import ( import (
"dfss/auth"
"dfss/dfssc/common"
"dfss/dfssc/security"
"encoding/json" "encoding/json"
"fmt" "fmt"
"dfss/auth"
"dfss/dfssc/common"
"dfss/dfssc/security"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
......
package user package user
import ( import (
"dfss/dfssc/common"
"dfss/dfssc/security"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
"dfss/dfssc/common"
"dfss/dfssc/security"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
......
package user package user
import ( import (
"dfss/auth"
"dfss/dfssc/common"
"dfss/dfssc/security"
"dfss/mockp/server"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
"time" "time"
"dfss/auth"
"dfss/dfssc/common"
"dfss/dfssc/security"
"dfss/mockp/server"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
......
...@@ -3,11 +3,10 @@ package user ...@@ -3,11 +3,10 @@ package user
import ( import (
"errors" "errors"
"golang.org/x/net/context"
"google.golang.org/grpc"
pb "dfss/dfssp/api" pb "dfss/dfssp/api"
"dfss/net" "dfss/net"
"golang.org/x/net/context"
"google.golang.org/grpc"
) )
// Unregister a user from the platform // Unregister a user from the platform
......
...@@ -8,9 +8,8 @@ import ( ...@@ -8,9 +8,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/spf13/viper"
"dfss/auth" "dfss/auth"
"github.com/spf13/viper"
) )
// PlatformID contains platform private key and root certificate // PlatformID contains platform private key and root certificate
......
...@@ -11,7 +11,6 @@ import ( ...@@ -11,7 +11,6 @@ import (
"dfss/dfssp/server" "dfss/dfssp/server"
"dfss/mgdb" "dfss/mgdb"
"dfss/net" "dfss/net"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/bson"
......
package contract_test package contract_test
import ( import (
"testing"
"dfss/dfssp/contract" "dfss/dfssp/contract"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"testing"
) )
var refSeq = []uint32{0, 1, 2, 0, 1, 2, 0, 1, 2} // for n = 3 var refSeq = []uint32{0, 1, 2, 0, 1, 2, 0, 1, 2} // for n = 3
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
package entities package entities
import ( import (
"dfss/mgdb"
"time" "time"
"dfss/mgdb"
"gopkg.in/mgo.v2" "gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/bson"
) )
......
package entities package entities
import ( import (
"dfss/mgdb"
"time" "time"
"dfss/mgdb"
"gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/bson"
) )
......
package user_test package user_test
import ( import (
"dfss/dfssp/api"
"testing" "testing"
"time" "time"
"dfss/dfssp/api"
"dfss/dfssp/entities" "dfss/dfssp/entities"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"golang.org/x/net/context" "golang.org/x/net/context"
......
package user_test package user_test
import ( import (
"dfss/dfssp/api"
"testing" "testing"
"time" "time"
"dfss/dfssp/api"
"dfss/dfssp/entities" "dfss/dfssp/entities"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"golang.org/x/net/context" "golang.org/x/net/context"
......
...@@ -4,7 +4,6 @@ package entities ...@@ -4,7 +4,6 @@ package entities
import ( import (
cAPI "dfss/dfssc/api" cAPI "dfss/dfssc/api"
"dfss/mgdb" "dfss/mgdb"
"gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/bson"
) )
......
package entities package entities
import ( import (
"crypto/sha512"
"fmt" "fmt"
"os" "os"
"testing" "testing"
"crypto/sha512"
cAPI "dfss/dfssc/api" cAPI "dfss/dfssc/api"
"dfss/mgdb" "dfss/mgdb"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
......
...@@ -2,9 +2,9 @@ package entities ...@@ -2,9 +2,9 @@ package entities
import ( import (
"bytes" "bytes"
"crypto/sha512"
"errors" "errors"
"crypto/sha512"
"dfss/auth" "dfss/auth"
cAPI "dfss/dfssc/api" cAPI "dfss/dfssc/api"
pAPI "dfss/dfssp/api" pAPI "dfss/dfssp/api"
......
package resolve package resolve
import ( import (
"crypto/sha512"
"fmt" "fmt"
"os" "os"
"testing" "testing"
"crypto/sha512"
cAPI "dfss/dfssc/api" cAPI "dfss/dfssc/api"
"dfss/dfsst/entities" "dfss/dfsst/entities"
"dfss/mgdb" "dfss/mgdb"
......
...@@ -10,12 +10,10 @@ import ( ...@@ -10,12 +10,10 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/spf13/viper"
"dfss/auth" "dfss/auth"
"dfss/dfsst/entities" "dfss/dfsst/entities"
"dfss/mgdb" "dfss/mgdb"
"github.com/spf13/viper"
"gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/bson"
) )
......
...@@ -7,7 +7,6 @@ import ( ...@@ -7,7 +7,6 @@ import (
"dfss/dfssc/user" "dfss/dfssc/user"
"dfss/gui/common" "dfss/gui/common"
"dfss/gui/config" "dfss/gui/config"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/visualfc/goqt/ui" "github.com/visualfc/goqt/ui"
) )
......
...@@ -2,9 +2,10 @@ package mgdb ...@@ -2,9 +2,10 @@ package mgdb
import ( import (
"fmt" "fmt"
"gopkg.in/mgo.v2/bson"
"os" "os"
"testing" "testing"
"gopkg.in/mgo.v2/bson"
) )
type card struct { type card struct {
......
package fixtures package fixtures
import ( import (
pb "dfss/dfssp/api" "dfss/dfssp/api"
) )
// AuthFixture holds the fixture for the Auth route // AuthFixture holds the fixture for the Auth route
var AuthFixture = map[string]*pb.RegisteredUser{ var AuthFixture = map[string]*api.RegisteredUser{
"default": &pb.RegisteredUser{ClientCert: "default"}, "default": &api.RegisteredUser{ClientCert: "default"},
} }
...@@ -9,7 +9,6 @@ import ( ...@@ -9,7 +9,6 @@ import (
"dfss/dfssp/api" "dfss/dfssp/api"
"dfss/mockp/fixtures" "dfss/mockp/fixtures"
"dfss/net" "dfss/net"
"golang.org/x/net/context" "golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
......
package tests package tests
import ( import (
"dfss/dfssc/common"
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
...@@ -9,6 +8,7 @@ import ( ...@@ -9,6 +8,7 @@ import (
"strings" "strings"
"testing" "testing"
"dfss/dfssc/common"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment