rename dir (#283)

diff --git a/cmd/fedd/main.go b/cmd/fedd/main.go
index 28d16cc..3cb91c6 100644 (file)
--- a/cmd/fedd/main.go
+++ b/cmd/fedd/main.go
@@ -5,15 +5,16 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/vapor/federation/api"
-       "github.com/vapor/federation/config"
-       "github.com/vapor/federation/database"
-       "github.com/vapor/federation/synchron"
+       "github.com/vapor/toolbar/federation/api"
+       "github.com/vapor/toolbar/federation/config"
+       "github.com/vapor/toolbar/federation/database"
+       "github.com/vapor/toolbar/common"
+       "github.com/vapor/toolbar/federation/synchron"
 )
 
 func main() {
        cfg := config.NewConfig()
-       db, err := database.NewMySQLDB(cfg.MySQLConfig)
+       db, err := common.NewMySQLDB(cfg.MySQLConfig)
        if err != nil {
                log.WithField("err", err).Panic("initialize mysql db error")
        }

diff --git a/toolbar/common/config.go b/toolbar/common/config.go
new file mode 100644 (file)
index 0000000..eec5a90
--- /dev/null
+++ b/toolbar/common/config.go
@@ -0,0 +1,14 @@
+package common
+
+type MySQLConfig struct {
+       Connection MySQLConnection `json:"connection"`
+       LogMode    bool            `json:"log_mode"`
+}
+
+type MySQLConnection struct {
+       Host     string `json:"host"`
+       Port     uint   `json:"port"`
+       Username string `json:"username"`
+       Password string `json:"password"`
+       DbName   string `json:"database"`
+}

diff --git a/federation/database/db.go b/toolbar/common/db.go
similarity index 83%
rename from federation/database/db.go
rename to toolbar/common/db.go
index 2005b37..6519445 100644 (file)
--- a/federation/database/db.go
+++ b/toolbar/common/db.go
@@ -1,4 +1,4 @@
-package database
+package common
 
 import (
        "fmt"
@@ -7,10 +7,9 @@ import (
        "github.com/jinzhu/gorm"
 
        "github.com/vapor/errors"
-       "github.com/vapor/federation/config"
 )
 
-func NewMySQLDB(cfg config.MySQLConfig) (*gorm.DB, error) {
+func NewMySQLDB(cfg MySQLConfig) (*gorm.DB, error) {
        dsnTemplate := "%s:%s@tcp(%s:%d)/%s?charset=utf8&parseTime=true&loc=Local"
        dsn := fmt.Sprintf(dsnTemplate, cfg.Connection.Username, cfg.Connection.Password, cfg.Connection.Host, cfg.Connection.Port, cfg.Connection.DbName)
        db, err := gorm.Open("mysql", dsn)

diff --git a/federation/api/common.go b/toolbar/federation/api/common.go
similarity index 100%
rename from federation/api/common.go
rename to toolbar/federation/api/common.go

diff --git a/federation/api/display.go b/toolbar/federation/api/display.go
similarity index 100%
rename from federation/api/display.go
rename to toolbar/federation/api/display.go

diff --git a/federation/api/errors.go b/toolbar/federation/api/errors.go
similarity index 100%
rename from federation/api/errors.go
rename to toolbar/federation/api/errors.go

diff --git a/federation/api/handler.go b/toolbar/federation/api/handler.go
similarity index 95%
rename from federation/api/handler.go
rename to toolbar/federation/api/handler.go
index feca2fe..8c7d6c3 100644 (file)
--- a/federation/api/handler.go
+++ b/toolbar/federation/api/handler.go
@@ -8,8 +8,8 @@ import (
        "github.com/gin-gonic/gin"
 
        "github.com/vapor/errors"
-       "github.com/vapor/federation/common"
-       "github.com/vapor/federation/database/orm"
+       "github.com/vapor/toolbar/federation/common"
+       "github.com/vapor/toolbar/federation/database/orm"
 )
 
 type listCrosschainTxsReq struct{ Display }

diff --git a/federation/api/pagination.go b/toolbar/federation/api/pagination.go
similarity index 100%
rename from federation/api/pagination.go
rename to toolbar/federation/api/pagination.go

diff --git a/federation/api/response.go b/toolbar/federation/api/response.go
similarity index 100%
rename from federation/api/response.go
rename to toolbar/federation/api/response.go

diff --git a/federation/api/server.go b/toolbar/federation/api/server.go
similarity index 99%
rename from federation/api/server.go
rename to toolbar/federation/api/server.go
index 9b01e93..b99adab 100644 (file)
--- a/federation/api/server.go
+++ b/toolbar/federation/api/server.go
@@ -10,7 +10,7 @@ import (
        "github.com/jinzhu/gorm"
 
        "github.com/vapor/errors"
-       "github.com/vapor/federation/config"
+       "github.com/vapor/toolbar/federation/config"
 )
 
 type Server struct {

diff --git a/federation/common/const.go b/toolbar/federation/common/const.go
similarity index 100%
rename from federation/common/const.go
rename to toolbar/federation/common/const.go

diff --git a/federation/common/util.go b/toolbar/federation/common/util.go
similarity index 100%
rename from federation/common/util.go
rename to toolbar/federation/common/util.go

diff --git a/federation/config/config.go b/toolbar/federation/config/config.go
similarity index 75%
rename from federation/config/config.go
rename to toolbar/federation/config/config.go
index d05082b..5cf4edd 100644 (file)
--- a/federation/config/config.go
+++ b/toolbar/federation/config/config.go
@@ -7,6 +7,7 @@ import (
        log "github.com/sirupsen/logrus"
 
        vaporJson "github.com/vapor/encoding/json"
+       "github.com/vapor/toolbar/common"
 )
 
 func NewConfig() *Config {
@@ -34,7 +35,7 @@ func NewConfigWithPath(path string) *Config {
 
 type Config struct {
        API            API                `json:"api"`
-       MySQLConfig    MySQLConfig        `json:"mysql"`
+       MySQLConfig    common.MySQLConfig `json:"mysql"`
        FederationProg vaporJson.HexBytes `json:"federation_prog"`
        Mainchain      Chain              `json:"mainchain"`
        Sidechain      Chain              `json:"sidechain"`
@@ -44,19 +45,6 @@ type API struct {
        IsReleaseMode bool `json:"is_release_mode"`
 }
 
-type MySQLConfig struct {
-       Connection MySQLConnection `json:"connection"`
-       LogMode    bool            `json:"log_mode"`
-}
-
-type MySQLConnection struct {
-       Host     string `json:"host"`
-       Port     uint   `json:"port"`
-       Username string `json:"username"`
-       Password string `json:"password"`
-       DbName   string `json:"database"`
-}
-
 type Chain struct {
        Name          string `json:"name"`
        Upstream      string `json:"upstream"`

diff --git a/federation/database/asset_store.go b/toolbar/federation/database/asset_store.go
similarity index 96%
rename from federation/database/asset_store.go
rename to toolbar/federation/database/asset_store.go
index 127c6f9..54b09c5 100644 (file)
--- a/federation/database/asset_store.go
+++ b/toolbar/federation/database/asset_store.go
@@ -7,7 +7,7 @@ import (
        "github.com/jinzhu/gorm"
 
        "github.com/vapor/errors"
-       "github.com/vapor/federation/database/orm"
+       "github.com/vapor/toolbar/federation/database/orm"
 )
 
 const (

diff --git a/federation/database/orm/asset.go b/toolbar/federation/database/orm/asset.go
similarity index 89%
rename from federation/database/orm/asset.go
rename to toolbar/federation/database/orm/asset.go
index 1672ce9..61c0287 100644 (file)
--- a/federation/database/orm/asset.go
+++ b/toolbar/federation/database/orm/asset.go
@@ -1,7 +1,7 @@
 package orm
 
 import (
-       "github.com/vapor/federation/types"
+       "github.com/vapor/toolbar/federation/types"
 )
 
 type Asset struct {

diff --git a/federation/database/orm/chain.go b/toolbar/federation/database/orm/chain.go
similarity index 82%
rename from federation/database/orm/chain.go
rename to toolbar/federation/database/orm/chain.go
index 8b92987..31f6c11 100644 (file)
--- a/federation/database/orm/chain.go
+++ b/toolbar/federation/database/orm/chain.go
@@ -1,7 +1,7 @@
 package orm
 
 import (
-       "github.com/vapor/federation/types"
+       "github.com/vapor/toolbar/federation/types"
 )
 
 type Chain struct {

diff --git a/federation/database/orm/cross_transaction.go b/toolbar/federation/database/orm/cross_transaction.go
similarity index 96%
rename from federation/database/orm/cross_transaction.go
rename to toolbar/federation/database/orm/cross_transaction.go
index 5da3f51..9d2eb29 100644 (file)
--- a/federation/database/orm/cross_transaction.go
+++ b/toolbar/federation/database/orm/cross_transaction.go
@@ -5,8 +5,8 @@ import (
        "encoding/json"
 
        "github.com/vapor/errors"
-       "github.com/vapor/federation/common"
-       "github.com/vapor/federation/types"
+       "github.com/vapor/toolbar/federation/common"
+       "github.com/vapor/toolbar/federation/types"
 )
 
 type CrossTransaction struct {

diff --git a/federation/database/orm/cross_transaction_req.go b/toolbar/federation/database/orm/cross_transaction_req.go
similarity index 94%
rename from federation/database/orm/cross_transaction_req.go
rename to toolbar/federation/database/orm/cross_transaction_req.go
index 5a58749..907cd3f 100644 (file)
--- a/federation/database/orm/cross_transaction_req.go
+++ b/toolbar/federation/database/orm/cross_transaction_req.go
@@ -1,7 +1,7 @@
 package orm
 
 import (
-       "github.com/vapor/federation/types"
+       "github.com/vapor/toolbar/federation/types"
 )
 
 type CrossTransactionReq struct {

diff --git a/federation/service/node.go b/toolbar/federation/service/node.go
similarity index 97%
rename from federation/service/node.go
rename to toolbar/federation/service/node.go
index eb71361..3817288 100644 (file)
--- a/federation/service/node.go
+++ b/toolbar/federation/service/node.go
@@ -4,7 +4,7 @@ import (
        "encoding/json"
 
        "github.com/vapor/errors"
-       "github.com/vapor/federation/util"
+       "github.com/vapor/toolbar/federation/util"
        "github.com/vapor/protocol/bc"
 )
 

diff --git a/federation/synchron/errors.go b/toolbar/federation/synchron/errors.go
similarity index 100%
rename from federation/synchron/errors.go
rename to toolbar/federation/synchron/errors.go

diff --git a/federation/synchron/mainchain_keeper.go b/toolbar/federation/synchron/mainchain_keeper.go
similarity index 97%
rename from federation/synchron/mainchain_keeper.go
rename to toolbar/federation/synchron/mainchain_keeper.go
index 8a50f79..31352a7 100644 (file)
--- a/federation/synchron/mainchain_keeper.go
+++ b/toolbar/federation/synchron/mainchain_keeper.go
@@ -16,11 +16,11 @@ import (
 
        "github.com/vapor/consensus"
        "github.com/vapor/errors"
-       "github.com/vapor/federation/common"
-       "github.com/vapor/federation/config"
-       "github.com/vapor/federation/database"
-       "github.com/vapor/federation/database/orm"
-       "github.com/vapor/federation/service"
+       "github.com/vapor/toolbar/federation/common"
+       "github.com/vapor/toolbar/federation/config"
+       "github.com/vapor/toolbar/federation/database"
+       "github.com/vapor/toolbar/federation/database/orm"
+       "github.com/vapor/toolbar/federation/service"
        "github.com/vapor/protocol/bc"
 )
 

diff --git a/federation/synchron/sidechain_keeper.go b/toolbar/federation/synchron/sidechain_keeper.go
similarity index 97%
rename from federation/synchron/sidechain_keeper.go
rename to toolbar/federation/synchron/sidechain_keeper.go
index d308e14..c17caf0 100644 (file)
--- a/federation/synchron/sidechain_keeper.go
+++ b/toolbar/federation/synchron/sidechain_keeper.go
@@ -11,11 +11,11 @@ import (
 
        "github.com/vapor/consensus"
        "github.com/vapor/errors"
-       "github.com/vapor/federation/common"
-       "github.com/vapor/federation/config"
-       "github.com/vapor/federation/database"
-       "github.com/vapor/federation/database/orm"
-       "github.com/vapor/federation/service"
+       "github.com/vapor/toolbar/federation/common"
+       "github.com/vapor/toolbar/federation/config"
+       "github.com/vapor/toolbar/federation/database"
+       "github.com/vapor/toolbar/federation/database/orm"
+       "github.com/vapor/toolbar/federation/service"
        "github.com/vapor/protocol/bc"
        "github.com/vapor/protocol/bc/types"
 )

diff --git a/federation/types/types.go b/toolbar/federation/types/types.go
similarity index 100%
rename from federation/types/types.go
rename to toolbar/federation/types/types.go

diff --git a/federation/util/http_util.go b/toolbar/federation/util/http_util.go
similarity index 100%
rename from federation/util/http_util.go
rename to toolbar/federation/util/http_util.go