Rename ContractLibErrors to RevertReasons

2018-06-22 18:45:45 +02:00
parent 7a216901be
commit 4409f11b24
11 changed files with 96 additions and 96 deletions
--- a/packages/contracts/test/libraries/lib_bytes.ts
+++ b/packages/contracts/test/libraries/lib_bytes.ts
@@ -11,7 +11,7 @@ import { artifacts } from '../../src/utils/artifacts';
 import { expectRevertOrOtherErrorAsync } from '../../src/utils/assertions';
 import { chaiSetup } from '../../src/utils/chai_setup';
 import { constants } from '../../src/utils/constants';
-import { ContractLibErrors } from '../../src/utils/types';
+import { RevertReasons } from '../../src/utils/types';
 import { provider, txDefaults, web3Wrapper } from '../../src/utils/web3_wrapper';

 chaiSetup.configure();
@@ -96,7 +96,7 @@ describe('LibBytes', () => {
        it('should revert if length is 0', async () => {
            return expectRevertOrOtherErrorAsync(
                libBytes.publicPopLastByte.callAsync(constants.NULL_BYTES),
-                ContractLibErrors.LibBytesGreaterThanZeroLengthRequired,
+                RevertReasons.LibBytesGreaterThanZeroLengthRequired,
            );
        });
        it('should pop the last byte from the input and return it', async () => {
@@ -112,7 +112,7 @@ describe('LibBytes', () => {
        it('should revert if length is less than 20', async () => {
            return expectRevertOrOtherErrorAsync(
                libBytes.publicPopLast20Bytes.callAsync(byteArrayShorterThan20Bytes),
-                ContractLibErrors.LibBytesGreaterOrEqualTo20LengthRequired
+                RevertReasons.LibBytesGreaterOrEqualTo20LengthRequired
            );
        });
        it('should pop the last 20 bytes from the input and return it', async () => {
@@ -173,7 +173,7 @@ describe('LibBytes', () => {
        it('should revert if dest is shorter than source', async () => {
            return expectRevertOrOtherErrorAsync(
                libBytes.publicDeepCopyBytes.callAsync(byteArrayShorterThan32Bytes, byteArrayLongerThan32Bytes),
-                ContractLibErrors.LibBytesGreaterOrEqualToSourceBytesLengthRequired
+                RevertReasons.LibBytesGreaterOrEqualToSourceBytesLengthRequired
            );
        });
        it('should overwrite dest with source if source and dest have equal length', async () => {
@@ -226,7 +226,7 @@ describe('LibBytes', () => {
            const offset = new BigNumber(0);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicReadAddress.callAsync(shortByteArray, offset),
-                ContractLibErrors.LibBytesGreaterOrEqualTo20LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo20LengthRequired,
            );
        });
        it('should fail if the length between the offset and end of the byte array is too short to hold an address', async () => {
@@ -234,7 +234,7 @@ describe('LibBytes', () => {
            const badOffset = new BigNumber(ethUtil.toBuffer(byteArray).byteLength);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicReadAddress.callAsync(byteArray, badOffset),
-                ContractLibErrors.LibBytesGreaterOrEqualTo20LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo20LengthRequired,
            );
        });
    });
@@ -270,7 +270,7 @@ describe('LibBytes', () => {
            const offset = new BigNumber(0);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicWriteAddress.callAsync(byteArrayShorterThan20Bytes, offset, testAddress),
-                ContractLibErrors.LibBytesGreaterOrEqualTo20LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo20LengthRequired,
            );
        });
        it('should fail if the length between the offset and end of the byte array is too short to hold an address', async () => {
@@ -278,7 +278,7 @@ describe('LibBytes', () => {
            const badOffset = new BigNumber(ethUtil.toBuffer(byteArray).byteLength);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicWriteAddress.callAsync(byteArray, badOffset, testAddress),
-                ContractLibErrors.LibBytesGreaterOrEqualTo20LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo20LengthRequired,
            );
        });
    });
@@ -302,14 +302,14 @@ describe('LibBytes', () => {
            const offset = new BigNumber(0);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicReadBytes32.callAsync(byteArrayShorterThan32Bytes, offset),
-                ContractLibErrors.LibBytesGreaterOrEqualTo32LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo32LengthRequired,
            );
        });
        it('should fail if the length between the offset and end of the byte array is too short to hold a bytes32', async () => {
            const badOffset = new BigNumber(ethUtil.toBuffer(testBytes32).byteLength);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicReadBytes32.callAsync(testBytes32, badOffset),
-                ContractLibErrors.LibBytesGreaterOrEqualTo32LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo32LengthRequired,
            );
        });
    });
@@ -345,7 +345,7 @@ describe('LibBytes', () => {
            const offset = new BigNumber(0);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicWriteBytes32.callAsync(byteArrayShorterThan32Bytes, offset, testBytes32),
-                ContractLibErrors.LibBytesGreaterOrEqualTo32LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo32LengthRequired,
            );
        });
        it('should fail if the length between the offset and end of the byte array is too short to hold a bytes32', async () => {
@@ -353,7 +353,7 @@ describe('LibBytes', () => {
            const badOffset = new BigNumber(ethUtil.toBuffer(byteArray).byteLength);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicWriteBytes32.callAsync(byteArray, badOffset, testBytes32),
-                ContractLibErrors.LibBytesGreaterOrEqualTo32LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo32LengthRequired,
            );
        });
    });
@@ -381,7 +381,7 @@ describe('LibBytes', () => {
            const offset = new BigNumber(0);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicReadUint256.callAsync(byteArrayShorterThan32Bytes, offset),
-                ContractLibErrors.LibBytesGreaterOrEqualTo32LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo32LengthRequired,
            );
        });
        it('should fail if the length between the offset and end of the byte array is too short to hold a uint256', async () => {
@@ -391,7 +391,7 @@ describe('LibBytes', () => {
            const badOffset = new BigNumber(testUint256AsBuffer.byteLength);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicReadUint256.callAsync(byteArray, badOffset),
-                ContractLibErrors.LibBytesGreaterOrEqualTo32LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo32LengthRequired,
            );
        });
    });
@@ -431,7 +431,7 @@ describe('LibBytes', () => {
            const offset = new BigNumber(0);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicWriteUint256.callAsync(byteArrayShorterThan32Bytes, offset, testUint256),
-                ContractLibErrors.LibBytesGreaterOrEqualTo32LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo32LengthRequired,
            );
        });
        it('should fail if the length between the offset and end of the byte array is too short to hold a uint256', async () => {
@@ -439,7 +439,7 @@ describe('LibBytes', () => {
            const badOffset = new BigNumber(ethUtil.toBuffer(byteArray).byteLength);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicWriteUint256.callAsync(byteArray, badOffset, testUint256),
-                ContractLibErrors.LibBytesGreaterOrEqualTo32LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo32LengthRequired,
            );
        });
    });
@@ -450,7 +450,7 @@ describe('LibBytes', () => {
            const byteArrayLessThan4Bytes = '0x010101';
            return expectRevertOrOtherErrorAsync(
                libBytes.publicReadFirst4.callAsync(byteArrayLessThan4Bytes),
-                ContractLibErrors.LibBytesGreaterOrEqualTo4LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo4LengthRequired,
            );
        });
        it('should return the first 4 bytes of a byte array of arbitrary length', async () => {
@@ -505,28 +505,28 @@ describe('LibBytes', () => {
            const offset = new BigNumber(0);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicReadBytes.callAsync(byteArrayShorterThan32Bytes, offset),
-                ContractLibErrors.LibBytesGreaterOrEqualTo32LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo32LengthRequired,
            );
        });
        it('should fail if we store a nested byte array length, without a nested byte array', async () => {
            const offset = new BigNumber(0);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicReadBytes.callAsync(testBytes32, offset),
-                ContractLibErrors.LibBytesGreaterOrEqualToNestedBytesLengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualToNestedBytesLengthRequired,
            );
        });
        it('should fail if the length between the offset and end of the byte array is too short to hold the length of a nested byte array', async () => {
            const badOffset = new BigNumber(ethUtil.toBuffer(byteArrayShorterThan32Bytes).byteLength);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicReadBytes.callAsync(byteArrayShorterThan32Bytes, badOffset),
-                ContractLibErrors.LibBytesGreaterOrEqualTo32LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo32LengthRequired,
            );
        });
        it('should fail if the length between the offset and end of the byte array is too short to hold the nested byte array', async () => {
            const badOffset = new BigNumber(ethUtil.toBuffer(testBytes32).byteLength);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicReadBytes.callAsync(testBytes32, badOffset),
-                ContractLibErrors.LibBytesGreaterOrEqualTo32LengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualTo32LengthRequired,
            );
        });
    });
@@ -606,7 +606,7 @@ describe('LibBytes', () => {
            const emptyByteArray = ethUtil.bufferToHex(new Buffer(1));
            return expectRevertOrOtherErrorAsync(
                libBytes.publicWriteBytes.callAsync(emptyByteArray, offset, longData),
-                ContractLibErrors.LibBytesGreaterOrEqualToNestedBytesLengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualToNestedBytesLengthRequired,
            );
        });
        it('should fail if the length between the offset and end of the byte array is too short to hold the length of a nested byte array)', async () => {
@@ -614,7 +614,7 @@ describe('LibBytes', () => {
            const badOffset = new BigNumber(ethUtil.toBuffer(shortTestBytesAsBuffer).byteLength);
            return expectRevertOrOtherErrorAsync(
                libBytes.publicWriteBytes.callAsync(emptyByteArray, badOffset, shortData),
-                ContractLibErrors.LibBytesGreaterOrEqualToNestedBytesLengthRequired,
+                RevertReasons.LibBytesGreaterOrEqualToNestedBytesLengthRequired,
            );
        });
    });