status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #821 from embark-framework/bug_fix/double-import 

Fix double http import
This commit is contained in:
Iuri Matias 2018-09-12 18:53:54 -04:00 committed by GitHub
parent edd9ece585 63be93856b
commit 53e3136ac6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/core/file.js
View File

@ -24,10 +24,11 @@ class File {
// Only supported in Solidity // Only supported in Solidity
return callback(null, content); return callback(null, content);
} }
const regex = /import ["|']([-a-zA-Z0-9@:%_+.~#?&\/=]+)["|'];/g; const regex = /import ["']([-a-zA-Z0-9@:%_+.~#?&\/=]+)["'];/g;
let matches; let matches;
const filesToDownload = []; const filesToDownload = [];
const pathWithoutFile = path.dirname(self.path); const pathWithoutFile = path.dirname(self.path);
let newContent = content;
while ((matches = regex.exec(content))) { while ((matches = regex.exec(content))) {
const httpFileObj = utils.getExternalContractUrl(matches[1]); const httpFileObj = utils.getExternalContractUrl(matches[1]);
const fileObj = { const fileObj = {
@ -36,7 +37,7 @@ class File {
}; };
if (httpFileObj) { if (httpFileObj) {
// Replace http import by filePath import in content // Replace http import by filePath import in content
content = content.replace(matches[1], httpFileObj.filePath); newContent = newContent.replace(matches[1], httpFileObj.filePath);
fileObj.fileRelativePath = httpFileObj.filePath; fileObj.fileRelativePath = httpFileObj.filePath;
fileObj.url = httpFileObj.url; fileObj.url = httpFileObj.url;
@ -49,7 +50,7 @@ class File {
if (self.downloadedImports) { if (self.downloadedImports) {
// We already parsed this file // We already parsed this file
return callback(null, content); return callback(null, newContent);
} }
self.downloadedImports = true; self.downloadedImports = true;
async.each(filesToDownload, ((fileObj, eachCb) => { async.each(filesToDownload, ((fileObj, eachCb) => {
@ -57,7 +58,7 @@ class File {
eachCb(); eachCb();
}); });
}), (err) => { }), (err) => {
callback(err, content); callback(err, newContent);
}); });
} }

1
test_apps/test_app/app/contracts/SimpleStorageWithHttpImport.sol
View File

@ -1,6 +1,7 @@
pragma solidity ^0.4.17; pragma solidity ^0.4.17;
import "https://github.com/embark-framework/embark/blob/develop/test_apps/contracts_app/contracts/ownable.sol"; import "https://github.com/embark-framework/embark/blob/develop/test_apps/contracts_app/contracts/ownable.sol";
import "https://github.com/embark-framework/embark/blob/develop/test_apps/contracts_app/contracts/contract_args.sol";
contract SimpleStorageWithHttpImport is Ownable { contract SimpleStorageWithHttpImport is Ownable {