Skip to content
This repository has been archived by the owner on Jan 24, 2022. It is now read-only.

Rename compiler manager to openzeppelin #1097

Merged
merged 1 commit into from
Jul 15, 2019
Merged

Rename compiler manager to openzeppelin #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli/src/commands/compile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ async function action(options: {
}

const compilerOptions: ProjectCompilerOptions = {
manager: 'zos',
manager: 'openzeppelin',
evmVersion,
version,
optimizer: {
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/src/models/compiler/Compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export async function compile(

// Validate compiler manager setting
const { manager } = resolvedOptions;
if (manager && manager !== 'truffle' && manager !== 'zos') {
throw new Error(`Unknown compiler manager '${manager}' (valid values are 'zos' or 'truffle')`);
if (manager && manager !== 'truffle' && manager !== 'zos' && manager !== 'openzeppelin') {
throw new Error(`Unknown compiler manager '${manager}' (valid values are 'openzeppelin' or 'truffle')`);
}

// We use truffle if set explicitly, or if nothing was set but there is a truffle.js file
Expand All @@ -41,7 +41,7 @@ export async function compile(
projectFile.setCompilerOptions({
...resolvedOptions,
...compileVersionOptions,
manager: useTruffle ? 'truffle' : 'zos',
manager: useTruffle ? 'truffle' : 'openzeppelin',
});
if (projectFile.exists()) projectFile.write();

Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/commands/compile.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe('compile command', function() {
'zos compile --solc-version 0.5.0 --optimizer --optimizer-runs 300 --evm-version petersburg',
function(compiler) {
compiler.should.have.been.calledWithMatch({
manager: 'zos',
manager: 'openzeppelin',
version: '0.5.0',
optimizer: { enabled: true, runs: 300 },
evmVersion: 'petersburg',
Expand All @@ -32,7 +32,7 @@ describe('compile command', function() {
'zos compile --solc-version 0.5.0 --optimizer=off',
function(compiler) {
compiler.should.have.been.calledWithMatch({
manager: 'zos',
manager: 'openzeppelin',
version: '0.5.0',
optimizer: { enabled: false },
});
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/models/compiler/Compiler.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('Compiler', function () {
});

it('compiles with zos if explicitly set', async function () {
await this.compile({ manager: 'zos' });
await this.compile({ manager: 'openzeppelin' });
this.solcCompile.should.have.been.calledOnce;
});

Expand All @@ -38,7 +38,7 @@ describe('Compiler', function () {
});

it('compiles with zos if set in local config', async function () {
this.projectFile.data.compiler = { manager: 'zos' };
this.projectFile.data.compiler = { manager: 'openzeppelin' };
await this.compile();
this.solcCompile.should.have.been.calledOnce;
});
Expand Down