Moved TransformableToArray, TransformableToBuffer interfaces to types

holgerd77 · holgerd77 · commit 45512f8c884d · 2020-10-07T16:33:36.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,6 +38,7 @@ For more info see the documentation or examples of usage in `test/account.spec.t
 A new file with helpful TypeScript types has been added to the exports of this project.
 
 In this release it contains `BNLike`, `BufferLike`, and `TransformableToBuffer`.
+
 ### Address.toBuffer()
 
 The Address class has as a new method `address.toBuffer()` that will give you a copy of the underlying `address.buf`.
diff --git a/src/bytes.ts b/src/bytes.ts
@@ -1,17 +1,8 @@
 import * as BN from 'bn.js'
 import { intToBuffer, stripHexPrefix, padToEven, isHexString, isHexPrefixed } from 'ethjs-util'
+import { TransformableToArray, TransformableToBuffer } from './types'
 import { assertIsBuffer, assertIsArray, assertIsHexString } from './helpers'
 
-// These can be moved to './types' when PR#275 is merged.
-export interface TransformableToArray {
-  toArray(): Uint8Array
-  toBuffer?(): Buffer
-}
-export interface TransformableToBuffer {
-  toBuffer(): Buffer
-  toArray?(): Uint8Array
-}
-
 /**
  * Returns a buffer filled with 0s.
  * @param bytes the number of bytes the buffer should be
diff --git a/src/types.ts b/src/types.ts
@@ -23,11 +23,20 @@ export type BufferLike =
  */
 export type PrefixedHexString = string
 
+/*
+ * A type that represents an object that has a `toArray()` method.
+ */
+export interface TransformableToArray {
+  toArray(): Uint8Array
+  toBuffer?(): Buffer
+}
+
 /*
  * A type that represents an object that has a `toBuffer()` method.
  */
 export interface TransformableToBuffer {
   toBuffer(): Buffer
+  toArray?(): Uint8Array
 }
 
 /**
