Commit aec44bc4 authored by keks's avatar keks Committed by Jeromy

use *oldcmds.Context consistently instead of non-ptr

License: MIT
Signed-off-by: default avatarkeks <keks@cryptoscope.co>
parent 091eeee2
......@@ -432,7 +432,7 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error
var opts = []corehttp.ServeOption{
corehttp.MetricsCollectionOption("api"),
corehttp.CheckVersionOption(),
corehttp.CommandsOption(*cctx),
corehttp.CommandsOption(cctx),
corehttp.WebUIOption,
gatewayOpt,
corehttp.VersionOption(),
......@@ -527,7 +527,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e
var opts = []corehttp.ServeOption{
corehttp.MetricsCollectionOption("gateway"),
corehttp.CheckVersionOption(),
corehttp.CommandsROOption(*cctx),
corehttp.CommandsROOption(cctx),
corehttp.VersionOption(),
corehttp.IPNSHostnameOption(),
corehttp.GatewayOption(writable, "/ipfs", "/ipns"),
......
......@@ -186,8 +186,8 @@ func IsHidden(path string) bool {
return false
}
func cmdCtx(node *core.IpfsNode, repoPath string) commands.Context {
return commands.Context{
func cmdCtx(node *core.IpfsNode, repoPath string) *commands.Context {
return &commands.Context{
Online: true,
ConfigRoot: repoPath,
LoadConfig: func(path string) (*config.Config, error) {
......
......@@ -110,7 +110,7 @@ func patchCORSVars(c *cmdsHttp.ServerConfig, addr net.Addr) {
c.SetAllowedOrigins(origins...)
}
func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption {
func commandsOption(cctx *oldcmds.Context, command *cmds.Command) ServeOption {
return func(n *core.IpfsNode, l net.Listener, mux *http.ServeMux) (*http.ServeMux, error) {
cfg := cmdsHttp.NewServerConfig()
......@@ -132,11 +132,11 @@ func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption {
}
}
func CommandsOption(cctx oldcmds.Context) ServeOption {
func CommandsOption(cctx *oldcmds.Context) ServeOption {
return commandsOption(cctx, corecommands.Root)
}
func CommandsROOption(cctx oldcmds.Context) ServeOption {
func CommandsROOption(cctx *oldcmds.Context) ServeOption {
return commandsOption(cctx, corecommands.RootRO)
}
......
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