Skip to content

Commit 2876e88

Browse files
committed
feat: adding Gateway endeavour - improve codebase
1 parent 93e9d96 commit 2876e88

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+767
-414
lines changed

gulpfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const gulp = require('gulp')
44
const parallel = require('async/parallel')
55
const series = require('async/series')
66
const createTempRepo = require('./test/utils/create-repo-nodejs.js')
7-
const HTTPAPI = require('./src/http-api')
7+
const HTTPAPI = require('./src/http')
88
const leftPad = require('left-pad')
99

1010
let nodes = []

package.json

+10-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"test:unit:node": "gulp test:node",
2828
"test:unit:node:core": "TEST=core npm run test:unit:node",
2929
"test:unit:node:http": "TEST=http npm run test:unit:node",
30+
"test:unit:node:gateway": "TEST=gateway npm run test:unit:node",
3031
"test:unit:node:cli": "TEST=cli npm run test:unit:node",
3132
"test:unit:browser": "gulp test:browser",
3233
"test:interop": "npm run test:interop:node",
@@ -92,8 +93,15 @@
9293
"async": "^2.5.0",
9394
"bl": "^1.2.1",
9495
"boom": "^5.2.0",
96+
<<<<<<< 93e9d9668d226ccb02cdeae90417b2f6ecadabc0
9597
"cids": "~0.5.1",
9698
"debug": "^3.0.1",
99+
=======
100+
"cids": "^0.5.1",
101+
"debug": "^3.0.0",
102+
"file-type": "^6.1.0",
103+
"filesize": "^3.5.10",
104+
>>>>>>> feat: adding Gateway endeavour - improve codebase
97105
"fsm-event": "^2.1.0",
98106
"glob": "^7.1.2",
99107
"hapi": "^16.5.2",
@@ -127,7 +135,8 @@
127135
"lodash.values": "^4.3.0",
128136
"mime-types": "^2.1.13",
129137
"mafmt": "^2.1.8",
130-
"mkdirp": "~0.5.1",
138+
"mime-types": "^2.1.16",
139+
"mkdirp": "^0.5.1",
131140
"multiaddr": "^2.3.0",
132141
"multihashes": "~0.4.8",
133142
"once": "^1.4.0",

src/cli/commands/daemon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const HttpAPI = require('../../http-api')
3+
const HttpAPI = require('../../http')
44
const utils = require('../utils')
55
const print = utils.print
66

src/http-api/gateway/resolver.js

-86
This file was deleted.

0 commit comments

Comments
 (0)