提交 aec44bc4 作者: keks 提交者: Jeromy

use *oldcmds.Context consistently instead of non-ptr

License: MIT
Signed-off-by: 's avatarkeks <keks@cryptoscope.co>
上级 091eeee2
...@@ -432,7 +432,7 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error ...@@ -432,7 +432,7 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error
var opts = []corehttp.ServeOption{ var opts = []corehttp.ServeOption{
corehttp.MetricsCollectionOption("api"), corehttp.MetricsCollectionOption("api"),
corehttp.CheckVersionOption(), corehttp.CheckVersionOption(),
corehttp.CommandsOption(*cctx), corehttp.CommandsOption(cctx),
corehttp.WebUIOption, corehttp.WebUIOption,
gatewayOpt, gatewayOpt,
corehttp.VersionOption(), corehttp.VersionOption(),
...@@ -527,7 +527,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e ...@@ -527,7 +527,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e
var opts = []corehttp.ServeOption{ var opts = []corehttp.ServeOption{
corehttp.MetricsCollectionOption("gateway"), corehttp.MetricsCollectionOption("gateway"),
corehttp.CheckVersionOption(), corehttp.CheckVersionOption(),
corehttp.CommandsROOption(*cctx), corehttp.CommandsROOption(cctx),
corehttp.VersionOption(), corehttp.VersionOption(),
corehttp.IPNSHostnameOption(), corehttp.IPNSHostnameOption(),
corehttp.GatewayOption(writable, "/ipfs", "/ipns"), corehttp.GatewayOption(writable, "/ipfs", "/ipns"),
......
...@@ -186,8 +186,8 @@ func IsHidden(path string) bool { ...@@ -186,8 +186,8 @@ func IsHidden(path string) bool {
return false return false
} }
func cmdCtx(node *core.IpfsNode, repoPath string) commands.Context { func cmdCtx(node *core.IpfsNode, repoPath string) *commands.Context {
return commands.Context{ return &commands.Context{
Online: true, Online: true,
ConfigRoot: repoPath, ConfigRoot: repoPath,
LoadConfig: func(path string) (*config.Config, error) { LoadConfig: func(path string) (*config.Config, error) {
......
...@@ -110,7 +110,7 @@ func patchCORSVars(c *cmdsHttp.ServerConfig, addr net.Addr) { ...@@ -110,7 +110,7 @@ func patchCORSVars(c *cmdsHttp.ServerConfig, addr net.Addr) {
c.SetAllowedOrigins(origins...) 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) { return func(n *core.IpfsNode, l net.Listener, mux *http.ServeMux) (*http.ServeMux, error) {
cfg := cmdsHttp.NewServerConfig() cfg := cmdsHttp.NewServerConfig()
...@@ -132,11 +132,11 @@ func commandsOption(cctx oldcmds.Context, command *cmds.Command) ServeOption { ...@@ -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) return commandsOption(cctx, corecommands.Root)
} }
func CommandsROOption(cctx oldcmds.Context) ServeOption { func CommandsROOption(cctx *oldcmds.Context) ServeOption {
return commandsOption(cctx, corecommands.RootRO) return commandsOption(cctx, corecommands.RootRO)
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论