gateway: use Api.FetchBlocks for NoFetch

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>

commands/context.go

@@ -70,16 +70,16 @@ func (c *Context) GetAPI() (coreiface.CoreAPI, error) {
 		if err != nil {
 			return nil, err
 		}
-		offline := false
+		fetchBlocks := true
 		if c.Gateway {
 			cfg, err := c.GetConfig()
 			if err != nil {
 				return nil, err
 			}
-			offline = cfg.Gateway.NoFetch
+			fetchBlocks = !cfg.Gateway.NoFetch
 		}
 
-		c.api, err = coreapi.NewCoreAPI(n, options.Api.Offline(offline))
+		c.api, err = coreapi.NewCoreAPI(n, options.Api.FetchBlocks(fetchBlocks))
 		if err != nil {
 			return nil, err
 		}

core/corehttp/gateway.go

@@ -26,7 +26,7 @@ func GatewayOption(writable bool, paths ...string) ServeOption {
 			return nil, err
 		}
 
-		api, err := coreapi.NewCoreAPI(n, options.Api.Offline(cfg.Gateway.NoFetch))
+		api, err := coreapi.NewCoreAPI(n, options.Api.FetchBlocks(!cfg.Gateway.NoFetch))
 		if err != nil {
 			return nil, err
 		}

test/sharness/t0110-gateway.sh

@@ -244,13 +244,13 @@ test_expect_success "try fetching not present ipns key from node 0" '
 '
 
 test_expect_success "try fetching present key from from node 0" '
-  BAR=$(ipfsi 0 add -Q > bar.hash) &&
+  BAR=$(echo "bar" | ipfsi 0 add -Q) &&
   curl -f "http://127.0.0.1:$GWPORT/ipfs/$BAR"
 '
 
 test_expect_success "try fetching present ipns key from node 0" '
   ipfsi 1 name publish /ipfs/$BAR &&
-  test_expect_code 22 curl -f "http://127.0.0.1:$GWPORT/ipns/$PEERID_1"
+  curl "http://127.0.0.1:$GWPORT/ipns/$PEERID_1"
 '
 
 test_expect_success "stop testbed" '