Explicit imports for calldata

3 files changed, 18 insertions, 12 deletions

diff --git a/packages/utils/src/abi_encoder/abstract_data_types/types/blob.ts b/packages/utils/src/abi_encoder/abstract_data_types/types/blob.ts
index cd2119673..a091e55b9 100644
--- a/packages/utils/src/abi_encoder/abstract_data_types/types/blob.ts
+++ b/packages/utils/src/abi_encoder/abstract_data_types/types/blob.ts
@@ -1,7 +1,9 @@
 import { DataItem } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { CalldataBlock, CalldataBlocks, RawCalldata } from '../../calldata';
+import { BlobCalldataBlock } from '../../calldata/blocks/blob';
+import { CalldataBlock } from '../../calldata/calldata_block';
+import { RawCalldata } from '../../calldata/raw_calldata';
 import { DecodingRules } from '../../utils/rules';
 
 import { DataType } from '../data_type';
@@ -15,12 +17,12 @@ export abstract class AbstractBlobDataType extends DataType {
         this._sizeKnownAtCompileTime = sizeKnownAtCompileTime;
     }
 
-    public generateCalldataBlock(value: any, parentBlock?: CalldataBlock): CalldataBlocks.Blob {
+    public generateCalldataBlock(value: any, parentBlock?: CalldataBlock): BlobCalldataBlock {
         const encodedValue = this.encodeValue(value);
         const name = this.getDataItem().name;
         const signature = this.getSignature();
         const parentName = _.isUndefined(parentBlock) ? '' : parentBlock.getName();
-        const block = new CalldataBlocks.Blob(name, signature, parentName, encodedValue);
+        const block = new BlobCalldataBlock(name, signature, parentName, encodedValue);
         return block;
     }
 
diff --git a/packages/utils/src/abi_encoder/abstract_data_types/types/pointer.ts b/packages/utils/src/abi_encoder/abstract_data_types/types/pointer.ts
index b6a6a7613..0f3c55280 100644
--- a/packages/utils/src/abi_encoder/abstract_data_types/types/pointer.ts
+++ b/packages/utils/src/abi_encoder/abstract_data_types/types/pointer.ts
@@ -2,7 +2,9 @@ import { DataItem } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
-import { CalldataBlock, CalldataBlocks, RawCalldata } from '../../calldata';
+import { PointerCalldataBlock } from '../../calldata/blocks/pointer';
+import { CalldataBlock } from '../../calldata/calldata_block';
+import { RawCalldata } from '../../calldata/raw_calldata';
 import { constants } from '../../utils/constants';
 import { DecodingRules } from '../../utils/rules';
 
@@ -19,7 +21,7 @@ export abstract class AbstractPointerDataType extends DataType {
         this._parent = parent;
     }
 
-    public generateCalldataBlock(value: any, parentBlock?: CalldataBlock): CalldataBlocks.Pointer {
+    public generateCalldataBlock(value: any, parentBlock?: CalldataBlock): PointerCalldataBlock {
         if (_.isUndefined(parentBlock)) {
             throw new Error(`DependentDataType requires a parent block to generate its block`);
         }
@@ -27,7 +29,7 @@ export abstract class AbstractPointerDataType extends DataType {
         const name = this.getDataItem().name;
         const signature = this.getSignature();
         const parentName = parentBlock.getName();
-        const block = new CalldataBlocks.Pointer(name, signature, parentName, destinationBlock, parentBlock);
+        const block = new PointerCalldataBlock(name, signature, parentName, destinationBlock, parentBlock);
         return block;
     }
 
diff --git a/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts b/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts
index 4c8bb7b1a..bbe29eff0 100644
--- a/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts
+++ b/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts
@@ -3,7 +3,9 @@ import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
 import { BigNumber } from '../../../configured_bignumber';
-import { CalldataBlock, CalldataBlocks, RawCalldata } from '../../calldata';
+import { SetCalldataBlock } from '../../calldata/blocks/set';
+import { CalldataBlock } from '../../calldata/calldata_block';
+import { RawCalldata } from '../../calldata/raw_calldata';
 import { constants } from '../../utils/constants';
 import { DecodingRules } from '../../utils/rules';
 
@@ -39,7 +41,7 @@ export abstract class AbstractSetDataType extends DataType {
         }
     }
 
-    public generateCalldataBlock(value: any[] | object, parentBlock?: CalldataBlock): CalldataBlocks.Set {
+    public generateCalldataBlock(value: any[] | object, parentBlock?: CalldataBlock): SetCalldataBlock {
         const block =
             value instanceof Array
                 ? this._generateCalldataBlockFromArray(value, parentBlock)
@@ -94,7 +96,7 @@ export abstract class AbstractSetDataType extends DataType {
         return isStatic;
     }
 
-    protected _generateCalldataBlockFromArray(value: any[], parentBlock?: CalldataBlock): CalldataBlocks.Set {
+    protected _generateCalldataBlockFromArray(value: any[], parentBlock?: CalldataBlock): SetCalldataBlock {
         // Sanity check: if the set has a defined length then `value` must have the same length.
         if (!_.isUndefined(this._arrayLength) && value.length !== this._arrayLength) {
             throw new Error(
@@ -105,7 +107,7 @@ export abstract class AbstractSetDataType extends DataType {
         }
         // Create a new calldata block for this set.
         const parentName = _.isUndefined(parentBlock) ? '' : parentBlock.getName();
-        const block: CalldataBlocks.Set = new CalldataBlocks.Set(
+        const block = new SetCalldataBlock(
             this.getDataItem().name,
             this.getSignature(),
             parentName,
@@ -130,10 +132,10 @@ export abstract class AbstractSetDataType extends DataType {
         return block;
     }
 
-    protected _generateCalldataBlockFromObject(obj: object, parentBlock?: CalldataBlock): CalldataBlocks.Set {
+    protected _generateCalldataBlockFromObject(obj: object, parentBlock?: CalldataBlock): SetCalldataBlock {
         // Create a new calldata block for this set.
         const parentName = _.isUndefined(parentBlock) ? '' : parentBlock.getName();
-        const block: CalldataBlocks.Set = new CalldataBlocks.Set(
+        const block = new SetCalldataBlock(
             this.getDataItem().name,
             this.getSignature(),
             parentName,