TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

config: move config.go out of config/

Browse source 
closes #423
This commit is contained in:
Anna Shaleva 2020-03-25 18:30:21 +03:00
parent 396c78c722
commit 5a984fdf88
21 changed files with 234 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkg/rpc/server/server.go
View file

@ -10,7 +10,8 @@ import (
"net/http"
"strconv"
"github.com/nspcc-dev/neo-go/config"
"github.com/nspcc-dev/neo-go/pkg/rpc"
"github.com/nspcc-dev/neo-go/pkg/core"
"github.com/nspcc-dev/neo-go/pkg/core/block"
"github.com/nspcc-dev/neo-go/pkg/core/state"
@ -35,7 +36,7 @@ type (
Server struct {
*http.Server
chain core.Blockchainer
config config.RPCConfig
config rpc.Config
coreServer *network.Server
log *zap.Logger
https *http.Server
@ -80,7 +81,7 @@ var invalidBlockHeightError = func(index int, height int) error {
}
// New creates a new Server struct.
func New(chain core.Blockchainer, conf config.RPCConfig, coreServer *network.Server, log *zap.Logger) Server {
func New(chain core.Blockchainer, conf rpc.Config, coreServer *network.Server, log *zap.Logger) Server {
httpServer := &http.Server{
Addr: conf.Address + ":" + strconv.FormatUint(uint64(conf.Port), 10),
}