Skip to content

Commit 3b21ecf

Browse files
magik6kmagik6k
committed
Move option parsing to BuildCfg; fix imports
License: MIT Signed-off-by: Łukasz Magiera <[email protected]>
1 parent 8d8a0e5 commit 3b21ecf

File tree

8 files changed

+70
-65
lines changed

8 files changed

+70
-65
lines changed

‎core/builder.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package core
33
import (
44
"context"
55

6+
"github.com/ipfs/go-metrics-interface"
67
"go.uber.org/fx"
78

89
"github.com/ipfs/go-ipfs/core/bootstrap"
@@ -13,6 +14,8 @@ type BuildCfg = node.BuildCfg // Alias for compatibility until we properly refac
1314

1415
// NewNode constructs and returns an IpfsNode using the given cfg.
1516
func NewNode(ctx context.Context, cfg *BuildCfg) (*IpfsNode, error) {
17+
ctx = metrics.CtxScope(ctx, "ipfs")
18+
1619
n := &IpfsNode{
1720
ctx: ctx,
1821
}

‎core/coreapi/path.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
gopath "path"
77

8-
node2 "github.com/ipfs/go-ipfs/namesys/resolve"
8+
"github.com/ipfs/go-ipfs/namesys/resolve"
99

1010
"github.com/ipfs/go-cid"
1111
ipld "github.com/ipfs/go-ipld-format"
@@ -38,8 +38,8 @@ func (api *CoreAPI) ResolvePath(ctx context.Context, p coreiface.Path) (coreifac
3838
}
3939

4040
ipath := ipfspath.Path(p.String())
41-
ipath, err := node2.ResolveIPNS(ctx, api.namesys, ipath)
42-
if err == node2.ErrNoNamesys {
41+
ipath, err := resolve.ResolveIPNS(ctx, api.namesys, ipath)
42+
if err == resolve.ErrNoNamesys {
4343
return nil, coreiface.ErrOffline
4444
} else if err != nil {
4545
return nil, err

‎core/node/builder.go

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
package node
22

33
import (
4+
"context"
45
"crypto/rand"
56
"encoding/base64"
67
"errors"
78

9+
"go.uber.org/fx"
10+
11+
"github.com/ipfs/go-ipfs/repo"
12+
813
ds "github.com/ipfs/go-datastore"
914
dsync "github.com/ipfs/go-datastore/sync"
1015
cfg "github.com/ipfs/go-ipfs-config"
1116
ci "github.com/libp2p/go-libp2p-crypto"
1217
peer "github.com/libp2p/go-libp2p-peer"
13-
14-
"github.com/ipfs/go-ipfs/repo"
1518
)
1619

1720
type BuildCfg struct {
@@ -75,6 +78,42 @@ func (cfg *BuildCfg) fillDefaults() error {
7578
return nil
7679
}
7780

81+
func (cfg *BuildCfg) options(ctx context.Context) fx.Option {
82+
err := cfg.fillDefaults()
83+
if err != nil {
84+
return fx.Error(err)
85+
}
86+
87+
repoOption := fx.Provide(func(lc fx.Lifecycle) repo.Repo {
88+
lc.Append(fx.Hook{
89+
OnStop: func(ctx context.Context) error {
90+
return cfg.Repo.Close()
91+
},
92+
})
93+
94+
return cfg.Repo
95+
})
96+
97+
metricsCtx := fx.Provide(func() MetricsCtx {
98+
return MetricsCtx(ctx)
99+
})
100+
101+
hostOption := fx.Provide(func() HostOption {
102+
return cfg.Host
103+
})
104+
105+
routingOption := fx.Provide(func() RoutingOption {
106+
return cfg.Routing
107+
})
108+
109+
return fx.Options(
110+
repoOption,
111+
hostOption,
112+
routingOption,
113+
metricsCtx,
114+
)
115+
}
116+
78117
func defaultRepo(dstore repo.Datastore) (repo.Repo, error) {
79118
c := cfg.Config{}
80119
priv, pub, err := ci.GenerateKeyPairWithReader(ci.RSA, 1024, rand.Reader)

‎core/node/core.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ import (
44
"context"
55
"fmt"
66

7+
"github.com/ipfs/go-ipfs/pin"
8+
"github.com/ipfs/go-ipfs/repo"
9+
710
"github.com/ipfs/go-bitswap"
811
"github.com/ipfs/go-bitswap/network"
912
"github.com/ipfs/go-blockservice"
1013
"github.com/ipfs/go-cid"
1114
"github.com/ipfs/go-datastore"
12-
blockstore "github.com/ipfs/go-ipfs-blockstore"
13-
exchange "github.com/ipfs/go-ipfs-exchange-interface"
14-
offline "github.com/ipfs/go-ipfs-exchange-offline"
15-
format "github.com/ipfs/go-ipld-format"
15+
"github.com/ipfs/go-ipfs-blockstore"
16+
"github.com/ipfs/go-ipfs-exchange-interface"
17+
"github.com/ipfs/go-ipfs-exchange-offline"
18+
"github.com/ipfs/go-ipld-format"
1619
"github.com/ipfs/go-merkledag"
1720
"github.com/ipfs/go-mfs"
1821
"github.com/ipfs/go-unixfs"
19-
host "github.com/libp2p/go-libp2p-host"
20-
routing "github.com/libp2p/go-libp2p-routing"
22+
"github.com/libp2p/go-libp2p-host"
23+
"github.com/libp2p/go-libp2p-routing"
2124
"go.uber.org/fx"
22-
23-
"github.com/ipfs/go-ipfs/pin"
24-
"github.com/ipfs/go-ipfs/repo"
2525
)
2626

2727
func BlockServiceCtor(lc fx.Lifecycle, bs blockstore.Blockstore, rem exchange.Interface) blockservice.BlockService {

‎core/node/groups.go

Lines changed: 6 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@ package node
33
import (
44
"context"
55

6+
"github.com/ipfs/go-ipfs/p2p"
7+
"github.com/ipfs/go-ipfs/provider"
8+
69
offline "github.com/ipfs/go-ipfs-exchange-offline"
7-
"github.com/ipfs/go-metrics-interface"
10+
offroute "github.com/ipfs/go-ipfs-routing/offline"
811
"github.com/ipfs/go-path/resolver"
912
"go.uber.org/fx"
10-
11-
offroute "github.com/ipfs/go-ipfs-routing/offline"
12-
"github.com/ipfs/go-ipfs/p2p"
13-
"github.com/ipfs/go-ipfs/provider"
14-
"github.com/ipfs/go-ipfs/repo"
1513
)
1614

1715
var BaseLibP2P = fx.Options(
@@ -117,44 +115,9 @@ func IPFS(ctx context.Context, cfg *BuildCfg) fx.Option {
117115
cfg = new(BuildCfg)
118116
}
119117

120-
err := cfg.fillDefaults()
121-
if err != nil {
122-
return fx.Error(err)
123-
}
124-
125-
ctx = metrics.CtxScope(ctx, "ipfs")
126-
127-
repoOption := fx.Provide(func(lc fx.Lifecycle) repo.Repo {
128-
lc.Append(fx.Hook{
129-
OnStop: func(ctx context.Context) error {
130-
return cfg.Repo.Close()
131-
},
132-
})
133-
134-
return cfg.Repo
135-
})
136-
137-
metricsCtx := fx.Provide(func() MetricsCtx {
138-
return MetricsCtx(ctx)
139-
})
140-
141-
hostOption := fx.Provide(func() HostOption {
142-
return cfg.Host
143-
})
144-
145-
routingOption := fx.Provide(func() RoutingOption {
146-
return cfg.Routing
147-
})
148-
149-
params := fx.Options(
150-
repoOption,
151-
hostOption,
152-
routingOption,
153-
metricsCtx,
154-
)
155-
156118
return fx.Options(
157-
params,
119+
cfg.options(ctx),
120+
158121
fx.Provide(baseProcess),
159122
fx.Invoke(setupSharding),
160123

‎core/node/libp2p.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ type Libp2pOpts struct {
123123
}
124124

125125
type PNetFingerprint []byte
126+
126127
func P2PPNet(repo repo.Repo) (opts Libp2pOpts, fp PNetFingerprint, err error) {
127128
swarmkey, err := repo.SwarmKey()
128129
if err != nil || swarmkey == nil {

‎fuse/ipns/ipns_unix.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
core "github.com/ipfs/go-ipfs/core"
1515
namesys "github.com/ipfs/go-ipfs/namesys"
16-
node2 "github.com/ipfs/go-ipfs/namesys/resolve"
16+
resolve "github.com/ipfs/go-ipfs/namesys/resolve"
1717

1818
dag "github.com/ipfs/go-merkledag"
1919
path "github.com/ipfs/go-path"
@@ -98,7 +98,7 @@ func loadRoot(ctx context.Context, rt *keyRoot, ipfs *core.IpfsNode, name string
9898
return nil, err
9999
}
100100

101-
node, err := node2.Resolve(ctx, ipfs.Namesys, ipfs.Resolver, p)
101+
node, err := resolve.Resolve(ctx, ipfs.Namesys, ipfs.Resolver, p)
102102
switch err {
103103
case nil:
104104
case namesys.ErrResolveFailed:

‎namesys/resolve/resolve.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"strings"
77

88
"github.com/ipfs/go-ipld-format"
9-
log2 "github.com/ipfs/go-log"
109
logging "github.com/ipfs/go-log"
1110
"github.com/ipfs/go-path"
1211
"github.com/ipfs/go-path/resolver"
@@ -30,34 +29,34 @@ func ResolveIPNS(ctx context.Context, nsys namesys.NameSystem, p path.Path) (pat
3029

3130
// TODO(cryptix): we should be able to query the local cache for the path
3231
if nsys == nil {
33-
evt.Append(log2.LoggableMap{"error": ErrNoNamesys.Error()})
32+
evt.Append(logging.LoggableMap{"error": ErrNoNamesys.Error()})
3433
return "", ErrNoNamesys
3534
}
3635

3736
seg := p.Segments()
3837

3938
if len(seg) < 2 || seg[1] == "" { // just "/<protocol/>" without further segments
40-
evt.Append(log2.LoggableMap{"error": path.ErrNoComponents.Error()})
39+
evt.Append(logging.LoggableMap{"error": path.ErrNoComponents.Error()})
4140
return "", path.ErrNoComponents
4241
}
4342

4443
extensions := seg[2:]
4544
resolvable, err := path.FromSegments("/", seg[0], seg[1])
4645
if err != nil {
47-
evt.Append(log2.LoggableMap{"error": err.Error()})
46+
evt.Append(logging.LoggableMap{"error": err.Error()})
4847
return "", err
4948
}
5049

5150
respath, err := nsys.Resolve(ctx, resolvable.String())
5251
if err != nil {
53-
evt.Append(log2.LoggableMap{"error": err.Error()})
52+
evt.Append(logging.LoggableMap{"error": err.Error()})
5453
return "", err
5554
}
5655

5756
segments := append(respath.Segments(), extensions...)
5857
p, err = path.FromSegments("/", segments...)
5958
if err != nil {
60-
evt.Append(log2.LoggableMap{"error": err.Error()})
59+
evt.Append(logging.LoggableMap{"error": err.Error()})
6160
return "", err
6261
}
6362
}

0 commit comments

Comments
 (0)