From 1b5e4032ff88c60c1bef097cdf4ec1728cfd2f3b Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Tue, 4 Nov 2014 03:56:51 -0800
Subject: [PATCH] refactor(init) extract context
---
cmd/ipfs2/init.go | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/cmd/ipfs2/init.go b/cmd/ipfs2/init.go
index eacaf6bcf..898b5411e 100644
--- a/cmd/ipfs2/init.go
+++ b/cmd/ipfs2/init.go
@@ -51,7 +51,7 @@ var initCmd = &cmds.Command{
nBitsForKeypair = 4096
}
- err := foo(res, req, dspath, force, nBitsForKeypair)
+ err := foo(res, req.Context().ConfigRoot, dspath, force, nBitsForKeypair)
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
@@ -59,11 +59,10 @@ var initCmd = &cmds.Command{
},
}
-func foo(res cmds.Response, req cmds.Request, dspath string, force bool, nBitsForKeypair int) error {
- ctx := req.Context()
+func foo(res cmds.Response, configRoot string, dspath string, force bool, nBitsForKeypair int) error {
- u.POut("initializing ipfs node at %s\n", ctx.ConfigRoot)
- filename, err := config.Filename(ctx.ConfigRoot)
+ u.POut("initializing ipfs node at %s\n", configRoot)
+ filename, err := config.Filename(configRoot)
if err != nil {
return errors.New("Couldn't get home directory path")
}
--
GitLab