mirror of
https://github.com/pezkuwichain/revive.git
synced 2026-04-22 02:07:55 +00:00
Run lint:fix (#309)
This commit is contained in:
+1
-1
@@ -2,5 +2,5 @@
|
||||
"trailingComma": "es5",
|
||||
"tabWidth": 2,
|
||||
"semi": false,
|
||||
"singleQuote": false
|
||||
"singleQuote": true
|
||||
}
|
||||
|
||||
@@ -1,19 +1,33 @@
|
||||
import * as path from 'path';
|
||||
import * as path from 'path'
|
||||
|
||||
const outputDir = 'artifacts';
|
||||
const binExtension = ':C.pvm';
|
||||
const asmExtension = ':C.pvmasm';
|
||||
const llvmExtension = '.ll';
|
||||
const contractSolFilename = 'contract.sol';
|
||||
const contractYulFilename = 'contract.yul';
|
||||
const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized';
|
||||
const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized';
|
||||
const pathToOutputDir = path.join(__dirname, '..', outputDir);
|
||||
const pathToContracts = path.join(__dirname, '..', 'src', 'contracts');
|
||||
const pathToBasicYulContract = path.join(pathToContracts, 'yul', contractYulFilename);
|
||||
const pathToBasicSolContract = path.join(pathToContracts, 'solidity', contractSolFilename);
|
||||
const pathToSolBinOutputFile = path.join(pathToOutputDir, contractSolFilename + binExtension);
|
||||
const pathToSolAsmOutputFile = path.join(pathToOutputDir, contractSolFilename + asmExtension);
|
||||
const outputDir = 'artifacts'
|
||||
const binExtension = ':C.pvm'
|
||||
const asmExtension = ':C.pvmasm'
|
||||
const llvmExtension = '.ll'
|
||||
const contractSolFilename = 'contract.sol'
|
||||
const contractYulFilename = 'contract.yul'
|
||||
const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized'
|
||||
const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized'
|
||||
const pathToOutputDir = path.join(__dirname, '..', outputDir)
|
||||
const pathToContracts = path.join(__dirname, '..', 'src', 'contracts')
|
||||
const pathToBasicYulContract = path.join(
|
||||
pathToContracts,
|
||||
'yul',
|
||||
contractYulFilename
|
||||
)
|
||||
const pathToBasicSolContract = path.join(
|
||||
pathToContracts,
|
||||
'solidity',
|
||||
contractSolFilename
|
||||
)
|
||||
const pathToSolBinOutputFile = path.join(
|
||||
pathToOutputDir,
|
||||
contractSolFilename + binExtension
|
||||
)
|
||||
const pathToSolAsmOutputFile = path.join(
|
||||
pathToOutputDir,
|
||||
contractSolFilename + asmExtension
|
||||
)
|
||||
|
||||
export const paths = {
|
||||
outputDir: outputDir,
|
||||
@@ -30,4 +44,4 @@ export const paths = {
|
||||
pathToBasicYulContract: pathToBasicYulContract,
|
||||
pathToSolBinOutputFile: pathToSolBinOutputFile,
|
||||
pathToSolAsmOutputFile: pathToSolAsmOutputFile,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,44 +1,51 @@
|
||||
import * as shell from 'shelljs';
|
||||
import * as fs from 'fs';
|
||||
import { spawnSync } from 'child_process';
|
||||
import * as shell from 'shelljs'
|
||||
import * as fs from 'fs'
|
||||
import { spawnSync } from 'child_process'
|
||||
|
||||
interface CommandResult {
|
||||
output: string;
|
||||
exitCode: number;
|
||||
output: string
|
||||
exitCode: number
|
||||
}
|
||||
|
||||
export const executeCommand = (command: string, stdin?: string): CommandResult => {
|
||||
export const executeCommand = (
|
||||
command: string,
|
||||
stdin?: string
|
||||
): CommandResult => {
|
||||
if (stdin) {
|
||||
const process = spawnSync(command, [], {
|
||||
input: stdin,
|
||||
shell: true,
|
||||
encoding: 'utf8',
|
||||
maxBuffer: 30 * 1024 * 1024
|
||||
});
|
||||
maxBuffer: 30 * 1024 * 1024,
|
||||
})
|
||||
|
||||
return {
|
||||
exitCode: process.status || 0,
|
||||
output: (process.stdout || process.stderr || '').toString()
|
||||
};
|
||||
output: (process.stdout || process.stderr || '').toString(),
|
||||
}
|
||||
}
|
||||
|
||||
const result = shell.exec(command, { silent: true, async: false });
|
||||
const result = shell.exec(command, { silent: true, async: false })
|
||||
return {
|
||||
exitCode: result.code,
|
||||
output: result.stdout || result.stderr || ''
|
||||
};
|
||||
};
|
||||
output: result.stdout || result.stderr || '',
|
||||
}
|
||||
}
|
||||
|
||||
export const isFolderExist = (folder: string): boolean => {
|
||||
return shell.test('-d', folder);
|
||||
};
|
||||
return shell.test('-d', folder)
|
||||
}
|
||||
|
||||
export const isFileExist = (pathToFileDir: string, fileName: string, fileExtension: string): boolean => {
|
||||
return shell.ls(pathToFileDir).stdout.includes(fileName + fileExtension);
|
||||
};
|
||||
export const isFileExist = (
|
||||
pathToFileDir: string,
|
||||
fileName: string,
|
||||
fileExtension: string
|
||||
): boolean => {
|
||||
return shell.ls(pathToFileDir).stdout.includes(fileName + fileExtension)
|
||||
}
|
||||
|
||||
export const isFileEmpty = (file: string): boolean => {
|
||||
if (fs.existsSync(file)) {
|
||||
return (fs.readFileSync(file).length === 0);
|
||||
return fs.readFileSync(file).length === 0
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,43 +1,44 @@
|
||||
import {executeCommand} from "../src/helper";
|
||||
import { paths } from '../src/entities';
|
||||
|
||||
import { executeCommand } from '../src/helper'
|
||||
import { paths } from '../src/entities'
|
||||
|
||||
//id1746
|
||||
describe("Run with --asm by default", () => {
|
||||
const command = `resolc ${paths.pathToBasicSolContract} --asm`;
|
||||
const result = executeCommand(command);
|
||||
const commandInvalid = 'resolc --asm';
|
||||
const resultInvalid = executeCommand(commandInvalid);
|
||||
describe('Run with --asm by default', () => {
|
||||
const command = `resolc ${paths.pathToBasicSolContract} --asm`
|
||||
const result = executeCommand(command)
|
||||
const commandInvalid = 'resolc --asm'
|
||||
const resultInvalid = executeCommand(commandInvalid)
|
||||
|
||||
it("Valid command exit code = 0", () => {
|
||||
expect(result.exitCode).toBe(0);
|
||||
});
|
||||
it('Valid command exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
|
||||
it("--asm output is presented", () => {
|
||||
const expectedPatterns = [/(deploy)/i, /(call)/i, /(seal_return)/i];
|
||||
it('--asm output is presented', () => {
|
||||
const expectedPatterns = [/(deploy)/i, /(call)/i, /(seal_return)/i]
|
||||
|
||||
for (const pattern of expectedPatterns) {
|
||||
expect(result.output).toMatch(pattern);
|
||||
expect(result.output).toMatch(pattern)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
it("solc exit code == resolc exit code", () => {
|
||||
const command = `solc ${paths.pathToBasicSolContract} --asm`;
|
||||
const solcResult = executeCommand(command);
|
||||
expect(solcResult.exitCode).toBe(result.exitCode);
|
||||
});
|
||||
it('solc exit code == resolc exit code', () => {
|
||||
const command = `solc ${paths.pathToBasicSolContract} --asm`
|
||||
const solcResult = executeCommand(command)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
|
||||
it("run invalid: resolc --asm", () => {
|
||||
expect(resultInvalid.output).toMatch(/(No input sources specified|Compilation aborted)/i);
|
||||
});
|
||||
it('run invalid: resolc --asm', () => {
|
||||
expect(resultInvalid.output).toMatch(
|
||||
/(No input sources specified|Compilation aborted)/i
|
||||
)
|
||||
})
|
||||
|
||||
it("Invalid command exit code = 1", () => {
|
||||
expect(resultInvalid.exitCode).toBe(1);
|
||||
});
|
||||
it('Invalid command exit code = 1', () => {
|
||||
expect(resultInvalid.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it("Invalid solc exit code == Invalid resolc exit code", () => {
|
||||
const command = 'solc --asm';
|
||||
const solcResult = executeCommand(command);
|
||||
expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
|
||||
});
|
||||
});
|
||||
it('Invalid solc exit code == Invalid resolc exit code', () => {
|
||||
const command = 'solc --asm'
|
||||
const solcResult = executeCommand(command)
|
||||
expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,191 +1,241 @@
|
||||
import { executeCommand, isFolderExist, isFileExist, isFileEmpty } from "../src/helper";
|
||||
import { paths } from '../src/entities';
|
||||
import * as shell from 'shelljs';
|
||||
import * as path from 'path';
|
||||
|
||||
import {
|
||||
executeCommand,
|
||||
isFolderExist,
|
||||
isFileExist,
|
||||
isFileEmpty,
|
||||
} from '../src/helper'
|
||||
import { paths } from '../src/entities'
|
||||
import * as shell from 'shelljs'
|
||||
import * as path from 'path'
|
||||
|
||||
//id1762
|
||||
describe("Run resolc without any options", () => {
|
||||
const command = 'resolc';
|
||||
const result = executeCommand(command);
|
||||
describe('Run resolc without any options', () => {
|
||||
const command = 'resolc'
|
||||
const result = executeCommand(command)
|
||||
|
||||
it("Info with help is presented", () => {
|
||||
expect(result.output).toMatch(/(Usage: resolc)/i);
|
||||
});
|
||||
it('Info with help is presented', () => {
|
||||
expect(result.output).toMatch(/(Usage: resolc)/i)
|
||||
})
|
||||
|
||||
it("Exit code = 1", () => {
|
||||
expect(result.exitCode).toBe(1);
|
||||
});
|
||||
|
||||
it("solc exit code == resolc exit code", () => {
|
||||
const command = 'solc';
|
||||
const solcResult = executeCommand(command);
|
||||
expect(solcResult.exitCode).toBe(result.exitCode);
|
||||
});
|
||||
});
|
||||
it('Exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it('solc exit code == resolc exit code', () => {
|
||||
const command = 'solc'
|
||||
const solcResult = executeCommand(command)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
|
||||
//#1713
|
||||
describe("Default run a command from the help", () => {
|
||||
describe('Default run a command from the help', () => {
|
||||
const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"` // potential issue on resolc with full path on Windows cmd
|
||||
const result = executeCommand(command)
|
||||
|
||||
const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
|
||||
const result = executeCommand(command);
|
||||
|
||||
it("Compiler run successful", () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i);
|
||||
});
|
||||
it("Exit code = 0", () => {
|
||||
expect(result.exitCode).toBe(0);
|
||||
});
|
||||
it("Output dir is created", () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
|
||||
});
|
||||
xit("Output file is created", () => { // a bug on windows
|
||||
expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
|
||||
});
|
||||
it("the output file is not empty", () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
|
||||
});
|
||||
it('Compiler run successful', () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i)
|
||||
})
|
||||
it('Exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
it('Output dir is created', () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
|
||||
})
|
||||
xit('Output file is created', () => {
|
||||
// a bug on windows
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractSolFilename,
|
||||
paths.binExtension
|
||||
)
|
||||
).toBe(true)
|
||||
})
|
||||
it('the output file is not empty', () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
|
||||
})
|
||||
it("No 'Error'/'Warning'/'Fail' in the output", () => {
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);
|
||||
});
|
||||
});
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i)
|
||||
})
|
||||
})
|
||||
|
||||
//#1818
|
||||
describe("Default run a command from the help", () => {
|
||||
describe('Default run a command from the help', () => {
|
||||
const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --asm --output-dir "${paths.pathToOutputDir}"` // potential issue on resolc with full path on Windows cmd
|
||||
const result = executeCommand(command)
|
||||
|
||||
const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --asm --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
|
||||
const result = executeCommand(command);
|
||||
|
||||
it("Compiler run successful", () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i);
|
||||
});
|
||||
it("Exit code = 0", () => {
|
||||
expect(result.exitCode).toBe(0);
|
||||
});
|
||||
it("Output dir is created", () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
|
||||
});
|
||||
xit("Output files are created", () => { // a bug on windows
|
||||
expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
|
||||
expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
|
||||
});
|
||||
it("the output files are not empty", () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
|
||||
expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
|
||||
});
|
||||
it('Compiler run successful', () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i)
|
||||
})
|
||||
it('Exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
it('Output dir is created', () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
|
||||
})
|
||||
xit('Output files are created', () => {
|
||||
// a bug on windows
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractSolFilename,
|
||||
paths.binExtension
|
||||
)
|
||||
).toBe(true)
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractSolFilename,
|
||||
paths.asmExtension
|
||||
)
|
||||
).toBe(true)
|
||||
})
|
||||
it('the output files are not empty', () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
|
||||
expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
|
||||
})
|
||||
it("No 'Error'/'Warning'/'Fail' in the output", () => {
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);
|
||||
});
|
||||
});
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i)
|
||||
})
|
||||
})
|
||||
|
||||
describe("Run resolc with source debug information", () => {
|
||||
describe('Run resolc with source debug information', () => {
|
||||
const commands = [
|
||||
`resolc -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
|
||||
`resolc --disable-solc-optimizer -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`
|
||||
]; // potential issue on resolc with full path on Windows cmd`;
|
||||
`resolc --disable-solc-optimizer -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
|
||||
] // potential issue on resolc with full path on Windows cmd`;
|
||||
|
||||
for (var idx in commands) {
|
||||
const command = commands[idx];
|
||||
const result = executeCommand(command);
|
||||
const command = commands[idx]
|
||||
const result = executeCommand(command)
|
||||
|
||||
it("Compiler run successful", () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i);
|
||||
});
|
||||
it("Exit code = 0", () => {
|
||||
expect(result.exitCode).toBe(0);
|
||||
});
|
||||
it("Output dir is created", () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
|
||||
});
|
||||
it("Output files are created", () => { // a bug on windows
|
||||
expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
|
||||
expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
|
||||
});
|
||||
it("the output files are not empty", () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
|
||||
expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
|
||||
});
|
||||
it('Compiler run successful', () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i)
|
||||
})
|
||||
it('Exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
it('Output dir is created', () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
|
||||
})
|
||||
it('Output files are created', () => {
|
||||
// a bug on windows
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractSolFilename,
|
||||
paths.binExtension
|
||||
)
|
||||
).toBe(true)
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractSolFilename,
|
||||
paths.asmExtension
|
||||
)
|
||||
).toBe(true)
|
||||
})
|
||||
it('the output files are not empty', () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
|
||||
expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
|
||||
})
|
||||
it("No 'Error'/'Fail' in the output", () => {
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i);
|
||||
});
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i)
|
||||
})
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
describe("Run resolc with source debug information, check LLVM debug-info", () => {
|
||||
describe('Run resolc with source debug information, check LLVM debug-info', () => {
|
||||
const commands = [
|
||||
`resolc -g ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
|
||||
`resolc -g --disable-solc-optimizer ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`
|
||||
]; // potential issue on resolc with full path on Windows cmd`;
|
||||
`resolc -g --disable-solc-optimizer ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
|
||||
] // potential issue on resolc with full path on Windows cmd`;
|
||||
|
||||
for (var idx in commands) {
|
||||
const command = commands[idx];
|
||||
const result = executeCommand(command);
|
||||
const command = commands[idx]
|
||||
const result = executeCommand(command)
|
||||
|
||||
it("Compiler run successful", () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i);
|
||||
});
|
||||
it("Exit code = 0", () => {
|
||||
expect(result.exitCode).toBe(0);
|
||||
});
|
||||
it("Output dir is created", () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
|
||||
});
|
||||
it("Output files are created", () => { // a bug on windows
|
||||
expect(isFileExist(paths.pathToOutputDir, paths.contractOptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
|
||||
expect(isFileExist(paths.pathToOutputDir, paths.contractUnoptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
|
||||
});
|
||||
it("the output files are not empty", () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
|
||||
expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
|
||||
});
|
||||
it('Compiler run successful', () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful.)/i)
|
||||
})
|
||||
it('Exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
it('Output dir is created', () => {
|
||||
expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
|
||||
})
|
||||
it('Output files are created', () => {
|
||||
// a bug on windows
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractOptimizedLLVMFilename,
|
||||
paths.llvmExtension
|
||||
)
|
||||
).toBe(true)
|
||||
expect(
|
||||
isFileExist(
|
||||
paths.pathToOutputDir,
|
||||
paths.contractUnoptimizedLLVMFilename,
|
||||
paths.llvmExtension
|
||||
)
|
||||
).toBe(true)
|
||||
})
|
||||
it('the output files are not empty', () => {
|
||||
expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
|
||||
expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
|
||||
})
|
||||
it("No 'Error'/'Fail' in the output", () => {
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i);
|
||||
});
|
||||
expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i)
|
||||
})
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
|
||||
|
||||
describe("Standard JSON compilation with path options", () => {
|
||||
const contractsDir = path.join(shell.tempdir(), 'contracts-test');
|
||||
const inputFile = path.join(__dirname, '..', 'src/contracts/compiled/1.json');
|
||||
describe('Standard JSON compilation with path options', () => {
|
||||
const contractsDir = path.join(shell.tempdir(), 'contracts-test')
|
||||
const inputFile = path.join(__dirname, '..', 'src/contracts/compiled/1.json')
|
||||
|
||||
beforeAll(() => {
|
||||
shell.mkdir('-p', contractsDir);
|
||||
shell.mkdir('-p', contractsDir)
|
||||
|
||||
const input = JSON.parse(shell.cat(inputFile).toString());
|
||||
const input = JSON.parse(shell.cat(inputFile).toString())
|
||||
|
||||
Object.entries(input.sources).forEach(([sourcePath, source]: [string, any]) => {
|
||||
const filePath = path.join(contractsDir, sourcePath);
|
||||
shell.mkdir('-p', path.dirname(filePath));
|
||||
shell.ShellString(source.content).to(filePath);
|
||||
});
|
||||
});
|
||||
Object.entries(input.sources).forEach(
|
||||
([sourcePath, source]: [string, any]) => {
|
||||
const filePath = path.join(contractsDir, sourcePath)
|
||||
shell.mkdir('-p', path.dirname(filePath))
|
||||
shell.ShellString(source.content).to(filePath)
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
afterAll(() => {
|
||||
shell.rm('-rf', contractsDir);
|
||||
});
|
||||
shell.rm('-rf', contractsDir)
|
||||
})
|
||||
|
||||
describe("Output with all path options", () => {
|
||||
let result: { exitCode: number; output: string };
|
||||
describe('Output with all path options', () => {
|
||||
let result: { exitCode: number; output: string }
|
||||
|
||||
beforeAll(() => {
|
||||
const tempInputFile = path.join(contractsDir, 'temp-input.json');
|
||||
shell.cp(inputFile, tempInputFile);
|
||||
const inputContent = shell.cat(inputFile).toString();
|
||||
const tempInputFile = path.join(contractsDir, 'temp-input.json')
|
||||
shell.cp(inputFile, tempInputFile)
|
||||
const inputContent = shell.cat(inputFile).toString()
|
||||
|
||||
const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`;
|
||||
const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`
|
||||
|
||||
result = executeCommand(command, inputContent);
|
||||
result = executeCommand(command, inputContent)
|
||||
|
||||
shell.rm(tempInputFile);
|
||||
shell.rm(tempInputFile)
|
||||
})
|
||||
|
||||
});
|
||||
|
||||
it("Compiler run successful without emiting warnings", () => {
|
||||
it('Compiler run successful without emiting warnings', () => {
|
||||
const parsedResults = JSON.parse(result.output)
|
||||
expect(parsedResults.errors.filter((error: { type: string; }) => error.type != 'Warning')).toEqual([]);
|
||||
});
|
||||
});
|
||||
});
|
||||
expect(
|
||||
parsedResults.errors.filter(
|
||||
(error: { type: string }) => error.type != 'Warning'
|
||||
)
|
||||
).toEqual([])
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,40 +1,39 @@
|
||||
import {executeCommand} from "../src/helper";
|
||||
import { paths } from '../src/entities';
|
||||
|
||||
import { executeCommand } from '../src/helper'
|
||||
import { paths } from '../src/entities'
|
||||
|
||||
//id1743
|
||||
describe("Run with --yul by default", () => {
|
||||
const command = `resolc ${paths.pathToBasicYulContract} --yul`;
|
||||
const result = executeCommand(command);
|
||||
const commandInvalid = 'resolc --yul';
|
||||
const resultInvalid = executeCommand(commandInvalid);
|
||||
describe('Run with --yul by default', () => {
|
||||
const command = `resolc ${paths.pathToBasicYulContract} --yul`
|
||||
const result = executeCommand(command)
|
||||
const commandInvalid = 'resolc --yul'
|
||||
const resultInvalid = executeCommand(commandInvalid)
|
||||
|
||||
it("Valid command exit code = 0", () => {
|
||||
expect(result.exitCode).toBe(0);
|
||||
});
|
||||
it('Valid command exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
|
||||
it("--yul output is presented", () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful)/i);
|
||||
expect(result.output).toMatch(/(No output requested)/i);
|
||||
});
|
||||
it('--yul output is presented', () => {
|
||||
expect(result.output).toMatch(/(Compiler run successful)/i)
|
||||
expect(result.output).toMatch(/(No output requested)/i)
|
||||
})
|
||||
|
||||
xit('solc exit code == resolc exit code', () => {
|
||||
// unknown solc issue for datatype of the contract
|
||||
const command = `solc ${paths.pathToBasicSolContract} --yul`
|
||||
const solcResult = executeCommand(command)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
|
||||
xit("solc exit code == resolc exit code", () => { // unknown solc issue for datatype of the contract
|
||||
const command = `solc ${paths.pathToBasicSolContract} --yul`;
|
||||
const solcResult = executeCommand(command);
|
||||
expect(solcResult.exitCode).toBe(result.exitCode);
|
||||
});
|
||||
it('run invalid: resolc --yul', () => {
|
||||
expect(resultInvalid.output).toMatch(/(The input file is missing)/i)
|
||||
})
|
||||
it('Invalid command exit code = 1', () => {
|
||||
expect(resultInvalid.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it("run invalid: resolc --yul", () => {
|
||||
expect(resultInvalid.output).toMatch(/(The input file is missing)/i);
|
||||
});
|
||||
it("Invalid command exit code = 1", () => {
|
||||
expect(resultInvalid.exitCode).toBe(1);
|
||||
});
|
||||
|
||||
it("Invalid solc exit code == Invalid resolc exit code", () => {
|
||||
const command = 'solc --yul';
|
||||
const solcResult = executeCommand(command);
|
||||
expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
|
||||
});
|
||||
});
|
||||
it('Invalid solc exit code == Invalid resolc exit code', () => {
|
||||
const command = 'solc --yul'
|
||||
const solcResult = executeCommand(command)
|
||||
expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,153 +1,188 @@
|
||||
import { executeCommand } from "../src/helper";
|
||||
import { paths } from '../src/entities';
|
||||
import { executeCommand } from '../src/helper'
|
||||
import { paths } from '../src/entities'
|
||||
|
||||
|
||||
describe("Set of --combined-json tests", () => {
|
||||
const zksolcCommand = 'zksolc';
|
||||
const solcCommand = 'solc';
|
||||
const json_args: string[] = [`abi`, `hashes`, `metadata`, `devdoc`, `userdoc`, `storage-layout`, `ast`, `asm`, `bin`, `bin-runtime`];
|
||||
describe('Set of --combined-json tests', () => {
|
||||
const zksolcCommand = 'zksolc'
|
||||
const solcCommand = 'solc'
|
||||
const json_args: string[] = [
|
||||
`abi`,
|
||||
`hashes`,
|
||||
`metadata`,
|
||||
`devdoc`,
|
||||
`userdoc`,
|
||||
`storage-layout`,
|
||||
`ast`,
|
||||
`asm`,
|
||||
`bin`,
|
||||
`bin-runtime`,
|
||||
]
|
||||
|
||||
//id1742:I
|
||||
describe(`Run ${zksolcCommand} with just --combined-json`, () => {
|
||||
const args = [`--combined-json`];
|
||||
const result = executeCommand(zksolcCommand, args);
|
||||
const args = [`--combined-json`]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it("Valid command exit code = 1", () => {
|
||||
expect(result.exitCode).toBe(1);
|
||||
});
|
||||
it('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it("--combined-json error is presented", () => {
|
||||
expect(result.output).toMatch(/(requires a value but none was supplied)/i);
|
||||
});
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(requires a value but none was supplied)/i)
|
||||
})
|
||||
|
||||
it("solc exit code == zksolc exit code", () => {
|
||||
const solcResult = executeCommand(solcCommand, args);
|
||||
expect(solcResult.exitCode).toBe(result.exitCode);
|
||||
});
|
||||
});
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
|
||||
//id1742:II
|
||||
describe(`Run ${zksolcCommand} with Sol contract and --combined-json`, () => {
|
||||
const args = [`${paths.pathToBasicSolContract}`, `--combined-json`];
|
||||
const result = executeCommand(zksolcCommand, args);
|
||||
const args = [`${paths.pathToBasicSolContract}`, `--combined-json`]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it("Valid command exit code = 1", () => {
|
||||
expect(result.exitCode).toBe(1);
|
||||
});
|
||||
it('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it("--combined-json error is presented", () => {
|
||||
expect(result.output).toMatch(/(requires a value but none was supplied)/i);
|
||||
});
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(requires a value but none was supplied)/i)
|
||||
})
|
||||
|
||||
it("solc exit code == zksolc exit code", () => {
|
||||
const solcResult = executeCommand(solcCommand, args);
|
||||
expect(solcResult.exitCode).toBe(result.exitCode);
|
||||
});
|
||||
});
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
|
||||
//id1742:III
|
||||
for (let i = 0; i < json_args.length; i++) {
|
||||
describe(`Run ${zksolcCommand} with Sol, --combined-json and ARG: ${json_args[i]}`, () => {
|
||||
const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`];
|
||||
const result = executeCommand(zksolcCommand, args);
|
||||
const args = [
|
||||
`${paths.pathToBasicSolContract}`,
|
||||
`--combined-json`,
|
||||
`${json_args[i]}`,
|
||||
]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it("Valid command exit code = 0", () => {
|
||||
expect(result.exitCode).toBe(0);
|
||||
});
|
||||
it('Valid command exit code = 0', () => {
|
||||
expect(result.exitCode).toBe(0)
|
||||
})
|
||||
|
||||
it("--combined-json error is presented", () => {
|
||||
expect(result.output).toMatch(/(contracts)/i);
|
||||
});
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(contracts)/i)
|
||||
})
|
||||
|
||||
it("solc exit code == zksolc exit code", () => {
|
||||
const solcResult = executeCommand(solcCommand, args);
|
||||
expect(solcResult.exitCode).toBe(result.exitCode);
|
||||
});
|
||||
});
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
//id1829:I
|
||||
for (let i = 0; i < json_args.length; i++) {
|
||||
describe(`Run ${zksolcCommand} with Sol, --combined-json and wrong ARG: --${json_args[i]}`, () => {
|
||||
const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `--${json_args[i]}`];
|
||||
const result = executeCommand(zksolcCommand, args);
|
||||
const args = [
|
||||
`${paths.pathToBasicSolContract}`,
|
||||
`--combined-json`,
|
||||
`--${json_args[i]}`,
|
||||
]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it("Valid command exit code = 1", () => {
|
||||
expect(result.exitCode).toBe(1);
|
||||
});
|
||||
it('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it("--combined-json error is presented", () => {
|
||||
expect(result.output).toMatch(/(Invalid option|error)/i);
|
||||
});
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(Invalid option|error)/i)
|
||||
})
|
||||
|
||||
it("solc exit code == zksolc exit code", () => {
|
||||
const solcResult = executeCommand(solcCommand, args);
|
||||
expect(solcResult.exitCode).toBe(result.exitCode);
|
||||
});
|
||||
});
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
//id1829:II
|
||||
for (let i = 0; i < json_args.length; i++) {
|
||||
describe(`Run ${zksolcCommand} with Sol, --combined-json and multiple ARG: ${json_args[i]} ${json_args[i]}`, () => {
|
||||
const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `${json_args[i]}`];
|
||||
const result = executeCommand(zksolcCommand, args);
|
||||
const args = [
|
||||
`${paths.pathToBasicSolContract}`,
|
||||
`--combined-json`,
|
||||
`${json_args[i]}`,
|
||||
`${json_args[i]}`,
|
||||
]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
xit("Valid command exit code = 1", () => {
|
||||
expect(result.exitCode).toBe(1);
|
||||
});
|
||||
xit('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it("--combined-json error is presented", () => {
|
||||
expect(result.output).toMatch(/(No such file or directory|cannot find the file specified)/i); // Hopefully we should have more precise message here!
|
||||
});
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(
|
||||
/(No such file or directory|cannot find the file specified)/i
|
||||
) // Hopefully we should have more precise message here!
|
||||
})
|
||||
|
||||
xit("solc exit code == zksolc exit code", () => {
|
||||
const solcResult = executeCommand(solcCommand, args);
|
||||
expect(solcResult.exitCode).toBe(result.exitCode);
|
||||
});
|
||||
});
|
||||
xit('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
//id1829:III
|
||||
for (let i = 0; i < json_args.length; i++) {
|
||||
describe(`Run ${zksolcCommand} with Sol, and multiple (--combined-json ${json_args[i]})`, () => {
|
||||
const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `--combined-json`, `${json_args[i]}`];
|
||||
const result = executeCommand(zksolcCommand, args);
|
||||
const args = [
|
||||
`${paths.pathToBasicSolContract}`,
|
||||
`--combined-json`,
|
||||
`${json_args[i]}`,
|
||||
`--combined-json`,
|
||||
`${json_args[i]}`,
|
||||
]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it("Valid command exit code = 1", () => {
|
||||
expect(result.exitCode).toBe(1);
|
||||
});
|
||||
it('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it("--combined-json error is presented", () => {
|
||||
expect(result.output).toMatch(/(cannot be used multiple times)/i);
|
||||
});
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(cannot be used multiple times)/i)
|
||||
})
|
||||
|
||||
it("solc exit code == zksolc exit code", () => {
|
||||
const solcResult = executeCommand(solcCommand, args);
|
||||
expect(solcResult.exitCode).toBe(result.exitCode);
|
||||
});
|
||||
});
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
//id1830
|
||||
for (let i = 0; i < json_args.length; i++) {
|
||||
describe(`Run ${zksolcCommand} with Yul, and --combined-json ${json_args[i]}`, () => {
|
||||
const args = [`${paths.pathToBasicYulContract}`, `--combined-json`, `${json_args[i]}`];
|
||||
const result = executeCommand(zksolcCommand, args);
|
||||
const args = [
|
||||
`${paths.pathToBasicYulContract}`,
|
||||
`--combined-json`,
|
||||
`${json_args[i]}`,
|
||||
]
|
||||
const result = executeCommand(zksolcCommand, args)
|
||||
|
||||
it("Valid command exit code = 1", () => {
|
||||
expect(result.exitCode).toBe(1);
|
||||
});
|
||||
it('Valid command exit code = 1', () => {
|
||||
expect(result.exitCode).toBe(1)
|
||||
})
|
||||
|
||||
it("--combined-json error is presented", () => {
|
||||
expect(result.output).toMatch(/(ParserError: Expected identifier)/i);
|
||||
});
|
||||
it('--combined-json error is presented', () => {
|
||||
expect(result.output).toMatch(/(ParserError: Expected identifier)/i)
|
||||
})
|
||||
asd
|
||||
|
||||
it("solc exit code == zksolc exit code", () => {
|
||||
const solcResult = executeCommand(solcCommand, args);
|
||||
expect(solcResult.exitCode).toBe(result.exitCode);
|
||||
});
|
||||
});
|
||||
it('solc exit code == zksolc exit code', () => {
|
||||
const solcResult = executeCommand(solcCommand, args)
|
||||
expect(solcResult.exitCode).toBe(result.exitCode)
|
||||
})
|
||||
})
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
+106
-110
@@ -1,142 +1,138 @@
|
||||
import { expect } from "chai";
|
||||
import { compile } from "../examples/node/revive.js";
|
||||
import { fileURLToPath } from "url";
|
||||
import path from "path";
|
||||
import fs from "fs";
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = path.dirname(__filename);
|
||||
import { expect } from 'chai'
|
||||
import { compile } from '../examples/node/revive.js'
|
||||
import { fileURLToPath } from 'url'
|
||||
import path from 'path'
|
||||
import fs from 'fs'
|
||||
const __filename = fileURLToPath(import.meta.url)
|
||||
const __dirname = path.dirname(__filename)
|
||||
|
||||
function loadFixture(fixture) {
|
||||
const fixturePath = path.resolve(__dirname, `../fixtures/${fixture}`);
|
||||
return JSON.parse(fs.readFileSync(fixturePath, "utf-8"));
|
||||
const fixturePath = path.resolve(__dirname, `../fixtures/${fixture}`)
|
||||
return JSON.parse(fs.readFileSync(fixturePath, 'utf-8'))
|
||||
}
|
||||
|
||||
describe("Compile Function Tests", function () {
|
||||
it("should successfully compile valid Solidity code", async function () {
|
||||
const standardInput = loadFixture("storage.json");
|
||||
describe('Compile Function Tests', function () {
|
||||
it('should successfully compile valid Solidity code', async function () {
|
||||
const standardInput = loadFixture('storage.json')
|
||||
|
||||
const result = await compile(standardInput);
|
||||
expect(result).to.be.a("string");
|
||||
const output = JSON.parse(result);
|
||||
expect(output).to.have.property("contracts");
|
||||
expect(output.contracts["fixtures/storage.sol"]).to.have.property(
|
||||
"Storage",
|
||||
);
|
||||
expect(output.contracts["fixtures/storage.sol"].Storage).to.have.property(
|
||||
"abi",
|
||||
);
|
||||
expect(output.contracts["fixtures/storage.sol"].Storage).to.have.property(
|
||||
"evm",
|
||||
);
|
||||
const result = await compile(standardInput)
|
||||
expect(result).to.be.a('string')
|
||||
const output = JSON.parse(result)
|
||||
expect(output).to.have.property('contracts')
|
||||
expect(output.contracts['fixtures/storage.sol']).to.have.property('Storage')
|
||||
expect(output.contracts['fixtures/storage.sol'].Storage).to.have.property(
|
||||
'abi'
|
||||
)
|
||||
expect(output.contracts['fixtures/storage.sol'].Storage).to.have.property(
|
||||
'evm'
|
||||
)
|
||||
expect(
|
||||
output.contracts["fixtures/storage.sol"].Storage.evm,
|
||||
).to.have.property("bytecode");
|
||||
});
|
||||
output.contracts['fixtures/storage.sol'].Storage.evm
|
||||
).to.have.property('bytecode')
|
||||
})
|
||||
|
||||
if (typeof globalThis.Bun == "undefined") {
|
||||
if (typeof globalThis.Bun == 'undefined') {
|
||||
// Running this test with Bun on a Linux host causes:
|
||||
// RuntimeError: Out of bounds memory access (evaluating 'getWasmTableEntry(index)(a1, a2, a3, a4, a5)')
|
||||
// Once this issue is resolved, the test will be re-enabled.
|
||||
it("should successfully compile large Solidity code", async function () {
|
||||
const standardInput = loadFixture("token.json");
|
||||
it('should successfully compile large Solidity code', async function () {
|
||||
const standardInput = loadFixture('token.json')
|
||||
|
||||
const result = await compile(standardInput);
|
||||
expect(result).to.be.a("string");
|
||||
const output = JSON.parse(result);
|
||||
expect(output).to.have.property("contracts");
|
||||
expect(output.contracts["fixtures/token.sol"]).to.have.property(
|
||||
"MyToken",
|
||||
);
|
||||
expect(output.contracts["fixtures/token.sol"].MyToken).to.have.property(
|
||||
"abi",
|
||||
);
|
||||
expect(output.contracts["fixtures/token.sol"].MyToken).to.have.property(
|
||||
"evm",
|
||||
);
|
||||
const result = await compile(standardInput)
|
||||
expect(result).to.be.a('string')
|
||||
const output = JSON.parse(result)
|
||||
expect(output).to.have.property('contracts')
|
||||
expect(output.contracts['fixtures/token.sol']).to.have.property('MyToken')
|
||||
expect(output.contracts['fixtures/token.sol'].MyToken).to.have.property(
|
||||
'abi'
|
||||
)
|
||||
expect(output.contracts['fixtures/token.sol'].MyToken).to.have.property(
|
||||
'evm'
|
||||
)
|
||||
expect(
|
||||
output.contracts["fixtures/token.sol"].MyToken.evm,
|
||||
).to.have.property("bytecode");
|
||||
});
|
||||
output.contracts['fixtures/token.sol'].MyToken.evm
|
||||
).to.have.property('bytecode')
|
||||
})
|
||||
|
||||
it("should successfully compile a valid Solidity contract that instantiates the token contracts", async function () {
|
||||
const standardInput = loadFixture("instantiate_tokens.json");
|
||||
it('should successfully compile a valid Solidity contract that instantiates the token contracts', async function () {
|
||||
const standardInput = loadFixture('instantiate_tokens.json')
|
||||
|
||||
const result = await compile(standardInput);
|
||||
expect(result).to.be.a("string");
|
||||
const output = JSON.parse(result);
|
||||
expect(output).to.have.property("contracts");
|
||||
const result = await compile(standardInput)
|
||||
expect(result).to.be.a('string')
|
||||
const output = JSON.parse(result)
|
||||
expect(output).to.have.property('contracts')
|
||||
expect(
|
||||
output.contracts["fixtures/instantiate_tokens.sol"],
|
||||
).to.have.property("TokensFactory");
|
||||
output.contracts['fixtures/instantiate_tokens.sol']
|
||||
).to.have.property('TokensFactory')
|
||||
expect(
|
||||
output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory,
|
||||
).to.have.property("abi");
|
||||
output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory
|
||||
).to.have.property('abi')
|
||||
expect(
|
||||
output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory,
|
||||
).to.have.property("evm");
|
||||
output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory
|
||||
).to.have.property('evm')
|
||||
expect(
|
||||
output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory.evm,
|
||||
).to.have.property("bytecode");
|
||||
});
|
||||
output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory.evm
|
||||
).to.have.property('bytecode')
|
||||
})
|
||||
}
|
||||
|
||||
it("should throw an error for invalid Solidity code", async function () {
|
||||
const standardInput = loadFixture("invalid_contract_content.json");
|
||||
it('should throw an error for invalid Solidity code', async function () {
|
||||
const standardInput = loadFixture('invalid_contract_content.json')
|
||||
|
||||
const result = await compile(standardInput);
|
||||
expect(result).to.be.a("string");
|
||||
const output = JSON.parse(result);
|
||||
expect(output).to.have.property("errors");
|
||||
expect(output.errors).to.be.an("array");
|
||||
expect(output.errors.length).to.be.greaterThan(0);
|
||||
expect(output.errors[0].type).to.exist;
|
||||
expect(output.errors[0].type).to.contain("ParserError");
|
||||
});
|
||||
const result = await compile(standardInput)
|
||||
expect(result).to.be.a('string')
|
||||
const output = JSON.parse(result)
|
||||
expect(output).to.have.property('errors')
|
||||
expect(output.errors).to.be.an('array')
|
||||
expect(output.errors.length).to.be.greaterThan(0)
|
||||
expect(output.errors[0].type).to.exist
|
||||
expect(output.errors[0].type).to.contain('ParserError')
|
||||
})
|
||||
|
||||
it("should return not found error for missing imports", async function () {
|
||||
const standardInput = loadFixture("missing_import.json");
|
||||
it('should return not found error for missing imports', async function () {
|
||||
const standardInput = loadFixture('missing_import.json')
|
||||
|
||||
const result = await compile(standardInput);
|
||||
const output = JSON.parse(result);
|
||||
expect(output).to.have.property("errors");
|
||||
expect(output.errors).to.be.an("array");
|
||||
expect(output.errors.length).to.be.greaterThan(0);
|
||||
expect(output.errors[0].message).to.exist;
|
||||
const result = await compile(standardInput)
|
||||
const output = JSON.parse(result)
|
||||
expect(output).to.have.property('errors')
|
||||
expect(output.errors).to.be.an('array')
|
||||
expect(output.errors.length).to.be.greaterThan(0)
|
||||
expect(output.errors[0].message).to.exist
|
||||
expect(output.errors[0].message).to.include(
|
||||
'Source "nonexistent/console.sol" not found',
|
||||
);
|
||||
});
|
||||
'Source "nonexistent/console.sol" not found'
|
||||
)
|
||||
})
|
||||
|
||||
it("should successfully compile a valid Solidity contract that instantiates another contract", async function () {
|
||||
const standardInput = loadFixture("instantiate.json");
|
||||
it('should successfully compile a valid Solidity contract that instantiates another contract', async function () {
|
||||
const standardInput = loadFixture('instantiate.json')
|
||||
|
||||
const result = await compile(standardInput);
|
||||
expect(result).to.be.a("string");
|
||||
const output = JSON.parse(result);
|
||||
expect(output).to.have.property("contracts");
|
||||
expect(output.contracts["fixtures/instantiate.sol"]).to.have.property(
|
||||
"ChildContract",
|
||||
);
|
||||
const result = await compile(standardInput)
|
||||
expect(result).to.be.a('string')
|
||||
const output = JSON.parse(result)
|
||||
expect(output).to.have.property('contracts')
|
||||
expect(output.contracts['fixtures/instantiate.sol']).to.have.property(
|
||||
'ChildContract'
|
||||
)
|
||||
expect(
|
||||
output.contracts["fixtures/instantiate.sol"].ChildContract,
|
||||
).to.have.property("abi");
|
||||
output.contracts['fixtures/instantiate.sol'].ChildContract
|
||||
).to.have.property('abi')
|
||||
expect(
|
||||
output.contracts["fixtures/instantiate.sol"].ChildContract,
|
||||
).to.have.property("evm");
|
||||
output.contracts['fixtures/instantiate.sol'].ChildContract
|
||||
).to.have.property('evm')
|
||||
expect(
|
||||
output.contracts["fixtures/instantiate.sol"].ChildContract.evm,
|
||||
).to.have.property("bytecode");
|
||||
expect(output.contracts["fixtures/instantiate.sol"]).to.have.property(
|
||||
"MainContract",
|
||||
);
|
||||
output.contracts['fixtures/instantiate.sol'].ChildContract.evm
|
||||
).to.have.property('bytecode')
|
||||
expect(output.contracts['fixtures/instantiate.sol']).to.have.property(
|
||||
'MainContract'
|
||||
)
|
||||
expect(
|
||||
output.contracts["fixtures/instantiate.sol"].MainContract,
|
||||
).to.have.property("abi");
|
||||
output.contracts['fixtures/instantiate.sol'].MainContract
|
||||
).to.have.property('abi')
|
||||
expect(
|
||||
output.contracts["fixtures/instantiate.sol"].MainContract,
|
||||
).to.have.property("evm");
|
||||
output.contracts['fixtures/instantiate.sol'].MainContract
|
||||
).to.have.property('evm')
|
||||
expect(
|
||||
output.contracts["fixtures/instantiate.sol"].MainContract.evm,
|
||||
).to.have.property("bytecode");
|
||||
});
|
||||
});
|
||||
output.contracts['fixtures/instantiate.sol'].MainContract.evm
|
||||
).to.have.property('bytecode')
|
||||
})
|
||||
})
|
||||
|
||||
@@ -169,8 +169,7 @@ async function main() {
|
||||
writeFile(
|
||||
contractFileName + '.polkavm',
|
||||
Buffer.from(
|
||||
output.contracts[fileName][contractName].evm.bytecode
|
||||
.object,
|
||||
output.contracts[fileName][contractName].evm.bytecode.object,
|
||||
'hex'
|
||||
)
|
||||
)
|
||||
@@ -179,9 +178,7 @@ async function main() {
|
||||
if (options.abi) {
|
||||
writeFile(
|
||||
contractFileName + '.abi',
|
||||
toFormattedJson(
|
||||
output.contracts[fileName][contractName].abi
|
||||
)
|
||||
toFormattedJson(output.contracts[fileName][contractName].abi)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import assert from 'node:assert'
|
||||
import { compile, tryResolveImport } from '.'
|
||||
import { resolve } from 'node:path'
|
||||
|
||||
|
||||
const compileOptions = [{}]
|
||||
if (existsSync('../../target/release/resolc')) {
|
||||
compileOptions.push({ bin: '../../target/release/resolc' })
|
||||
@@ -57,9 +56,7 @@ test('check Err from stderr', async () => {
|
||||
assert(false, 'Expected error')
|
||||
} catch (error) {
|
||||
assert(
|
||||
String(error).includes(
|
||||
'Source file requires different compiler version'
|
||||
)
|
||||
String(error).includes('Source file requires different compiler version')
|
||||
)
|
||||
}
|
||||
})
|
||||
@@ -74,12 +71,16 @@ test('resolve import', () => {
|
||||
// scopped module with version
|
||||
{
|
||||
file: '@openzeppelin/contracts@5.1.0/token/ERC20/ERC20.sol',
|
||||
expected: require.resolve('@openzeppelin/contracts/token/ERC20/ERC20.sol'),
|
||||
expected: require.resolve(
|
||||
'@openzeppelin/contracts/token/ERC20/ERC20.sol'
|
||||
),
|
||||
},
|
||||
// scopped module without version
|
||||
{
|
||||
file: '@openzeppelin/contracts/token/ERC20/ERC20.sol',
|
||||
expected: require.resolve('@openzeppelin/contracts/token/ERC20/ERC20.sol'),
|
||||
expected: require.resolve(
|
||||
'@openzeppelin/contracts/token/ERC20/ERC20.sol'
|
||||
),
|
||||
},
|
||||
// scopped module with wrong version
|
||||
{
|
||||
|
||||
@@ -138,9 +138,7 @@ export function tryResolveImport(importPath: string) {
|
||||
|
||||
let packageJsonPath
|
||||
try {
|
||||
packageJsonPath = require.resolve(
|
||||
path.join(basePackage, 'package.json')
|
||||
)
|
||||
packageJsonPath = require.resolve(path.join(basePackage, 'package.json'))
|
||||
} catch {
|
||||
throw new Error(`Could not resolve package ${basePackage}`)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user