Edit (#275)

[bytom/vapor.git] / federation / config / config.go

diff --git a/federation/config/config.go b/federation/config/config.go
index 52568dc..d05082b 100644 (file)
--- a/federation/config/config.go
+++ b/federation/config/config.go
@@ -6,7 +6,7 @@ import (
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/vapor/crypto/ed25519/chainkd"
+       vaporJson "github.com/vapor/encoding/json"
 )
 
 func NewConfig() *Config {
@@ -33,12 +33,11 @@ func NewConfigWithPath(path string) *Config {
 }
 
 type Config struct {
-       API         API         `json:"api"`
-       MySQLConfig MySQLConfig `json:"mysql"`
-       Warders     []Warder    `json:"warders"`
-       Quorum      int         `json:"quorum"`
-       Mainchain   Chain       `json:"mainchain"`
-       Sidechain   Chain       `json:"sidechain"`
+       API            API                `json:"api"`
+       MySQLConfig    MySQLConfig        `json:"mysql"`
+       FederationProg vaporJson.HexBytes `json:"federation_prog"`
+       Mainchain      Chain              `json:"mainchain"`
+       Sidechain      Chain              `json:"sidechain"`
 }
 
 type API struct {
@@ -58,11 +57,6 @@ type MySQLConnection struct {
        DbName   string `json:"database"`
 }
 
-type Warder struct {
-       Position uint8        `json:"position"`
-       XPub     chainkd.XPub `json:"xpub"`
-}
-
 type Chain struct {
        Name          string `json:"name"`
        Upstream      string `json:"upstream"`