add real packages as dependencies, reformat codebase

ethereumjs · Dec 13, 2018 · 5423792 · 5423792
1 parent 9a082d0
commit 5423792
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 33 deletions.
diff --git a/.nycrc b/.nycrc
@@ -1,3 +1,3 @@
 {
-  "extends": "ethereumjs-config-nyc"
+  "extends": "@ethereumjs/config-nyc"
 }
diff --git a/package.json b/package.json
@@ -47,6 +47,10 @@
     "safe-buffer": "^5.1.1"
   },
   "devDependencies": {
+    "@ethereumjs/config-nyc": "^1.0.0",
+    "@ethereumjs/config-prettier": "^1.0.0",
+    "@ethereumjs/config-tsc": "^1.0.0",
+    "@ethereumjs/config-tslint": "^1.0.0",
     "@types/bn.js": "^4.11.3",
     "@types/mocha": "^5.2.5",
     "@types/node": "^10.12.2",

diff --git a/prettier.config.js b/prettier.config.js
@@ -1 +1 @@
-module.exports = require('ethereumjs-config-prettier')
+module.exports = require('@ethereumjs/config-prettier')
diff --git a/src/index.ts b/src/index.ts
@@ -55,14 +55,8 @@ function encodeLength(len: number, offset: number): Buffer {
  **/
 export function decode(input: Buffer, stream?: boolean): Buffer
 export function decode(input: Buffer[], stream?: boolean): Buffer[]
-export function decode(
-  input: RLPInput,
-  stream?: boolean,
-): Buffer[] | Buffer | RLPDecoded
-export function decode(
-  input: RLPInput,
-  stream: boolean = false,
-): Buffer[] | Buffer | RLPDecoded {
+export function decode(input: RLPInput, stream?: boolean): Buffer[] | Buffer | RLPDecoded
+export function decode(input: RLPInput, stream: boolean = false): Buffer[] | Buffer | RLPDecoded {
   if (!input || (<any>input).length === 0) {
     return Buffer.from([])
   }
@@ -105,10 +99,7 @@ export function getLength(input: RLPInput): Buffer | number {
   } else {
     // a list  over 55 bytes long
     const llength = firstByte - 0xf6
-    const length = safeParseInt(
-      inputBuffer.slice(1, llength).toString('hex'),
-      16,
-    )
+    const length = safeParseInt(inputBuffer.slice(1, llength).toString('hex'), 16)
     return llength + length
   }
 }

diff --git a/src/types.ts b/src/types.ts
@@ -1,14 +1,6 @@
 import BN from 'bn.js'
 
-export type RLPInput =
-  | Buffer
-  | string
-  | number
-  | Uint8Array
-  | BN
-  | RLPObject
-  | RLPArray
-  | null
+export type RLPInput = Buffer | string | number | Uint8Array | BN | RLPObject | RLPArray | null
 
 export interface RLPArray extends Array<RLPInput> {}
 interface RLPObject {

diff --git a/test/index.ts b/test/index.ts
@@ -182,10 +182,7 @@ describe('nested lists:', function() {
   let encoded: Buffer
   it('encode a nested list', function() {
     encoded = RLP.encode(nestedList)
-    assert.deepEqual(
-      encoded,
-      Buffer.from([0xc7, 0xc0, 0xc1, 0xc0, 0xc3, 0xc0, 0xc1, 0xc0]),
-    )
+    assert.deepEqual(encoded, Buffer.from([0xc7, 0xc0, 0xc1, 0xc0, 0xc3, 0xc0, 0xc1, 0xc0]))
   })
 
   it('should decode a nested list', function() {
@@ -355,10 +352,7 @@ describe('offical tests', function() {
       }
 
       const encoded = RLP.encode(incoming)
-      assert.equal(
-        encoded.toString('hex'),
-        officalTests[test].out.toLowerCase(),
-      )
+      assert.equal(encoded.toString('hex'), officalTests[test].out.toLowerCase())
     }
     done()
   })

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,4 +1,4 @@
 {
-  "extends": "ethereumjs-config-tsc",
+  "extends": "@ethereumjs/config-tsc",
   "include": ["src/**/*.ts", "test/**/*.ts"]
 }
diff --git a/tslint.json b/tslint.json
@@ -1,3 +1,3 @@
 {
-  "extends": "ethereumjs-config-tslint"
+  "extends": "@ethereumjs/config-tslint"
 }