fix ipfs upload #2544
Merged
fix ipfs upload #2544
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yann300
force-pushed
the
fixIPFSUpload
branch
4 times, most recently
from
b08adc4
to
2c66e86
Compare
Aniket-Engg
approved these changes
Jan 23, 2020
src/lib/publishOnIpfs.js
Outdated
| @@ -27,11 +27,21 @@ module.exports = (contract, fileManager, cb, ipfsVerifiedPublishCallBack) => { | |||
|
|
|||
| async.eachSeries(Object.keys(metadata.sources), function (fileName, cb) { | |||
| // find hash | |||
| var hash | |||
| var hash = null | |||
src/lib/publishOnIpfs.js
Outdated
| // TODO: refactor this with publishOnSwarm | ||
| if (metadata.sources[fileName].urls) { | ||
| metadata.sources[fileName].urls.forEach(url => { | ||
| if (url.indexOf('ipfs') !== -1) hash = url.match('dweb:/ipfs/(.+)')[1] |
There was a problem hiding this comment.
Can you consider using .includes instead of .indexOf on all the places
src/lib/publishOnIpfs.js
Outdated
| @@ -94,7 +104,7 @@ module.exports = (contract, fileManager, cb, ipfsVerifiedPublishCallBack) => { | |||
| async function ipfsVerifiedPublish (content, expectedHash, cb) { | |||
| try { | |||
| const results = await severalGatewaysPush(content) | |||
| if (results !== expectedHash) { | |||
| if (expectedHash !== null && results !== expectedHash) { | |||
There was a problem hiding this comment.
Can we do (expectedHash&& results !== expectedHash) for all similar places?
src/lib/publishOnSwarm.js
Outdated
| @@ -20,11 +20,21 @@ module.exports = (contract, fileManager, cb, swarmVerifiedPublishCallBack) => { | |||
|
|
|||
| async.eachSeries(Object.keys(metadata.sources), function (fileName, cb) { | |||
| // find hash | |||
| var hash | |||
| var hash = null | |||
yann300
force-pushed
the
fixIPFSUpload
branch
from
2c66e86
to
91c78bf
Compare
|
ok added the changes @Aniket-Engg |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix https://github.com/ethereum/remix-ide/issues/2540