web3 · Spacesai1or · Feb 1, 2021 · Feb 1, 2021
@@ -110,29 +110,3 @@ jobs:
                   node-version: 12
             - uses: actions/checkout@v2
             - run: bash ./scripts/ci.sh
-    eth2:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                node: [10, 11, 12, 13]
-        env:
-            TEST: "eth2"
-        steps:
-            - uses: actions/setup-node@v1
-              with:
-                  node-version: ${{ matrix.node }}
-
-            - uses: actions/checkout@v2
-
-            - uses: actions/cache@v2
-              id: cache-deps
-              with:
-                  path: |
-                      node_modules
-                      */*/node_modules
-                  key: ${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
-
-            - run: npm ci
-              if: steps.cache-deps.outputs.cache-hit != 'true'
-
-            - run: bash ./scripts/ci.sh
@@ -321,6 +321,8 @@ Released with 1.0.0-beta.37 code base.
 
 - Update `dist` to latest release (`1.3.2`) (#3875)
 
+## [Unreleased]
+
 ## [1.3.4]
 
 ### Changed
@@ -348,15 +350,3 @@ Released with 1.0.0-beta.37 code base.
 - Add `ETH2Core` class export to `index.d.ts` for `web3-eth2-core` (#3878)
 - Deprecation of bzz warning (#3872)
 - Deprecation of shh warning (#3888)
-
-## [Unreleased]
-
-## [1.3.5]
-
-### Added
-
-- Github action for running tests for `web3-eth2-core` and `web3-eth2-beaconchain` packages (#3892)
-
-### Changed
-
-- Unified babel compiler for `web3-eth2-core` and `web3-eth2-beaconchain` (#3892)
@@ -1,10 +1,8 @@
+
 {
-  "presets": [
-    "@babel/preset-env",
-    "@babel/preset-typescript"
-  ],
-  "plugins": [
-    "@babel/plugin-proposal-class-properties",
-    "@babel/plugin-transform-runtime"
-  ]
-}
+    "presets": ["@babel/env", "@babel/typescript"],
+    "plugins": [
+      "@babel/proposal-class-properties",
+      "@babel/proposal-object-rest-spread"
+    ]
+  }
@@ -0,0 +1,8 @@
+module.exports = {
+    roots: ['<rootDir>/test'],
+    transform: {
+      '^.+\\.tsx?$': 'ts-jest',
+    },
+    testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$',
+    moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  }
@@ -1,6 +1,6 @@
 {
     "name": "web3-eth2-beaconchain",
-    "version": "1.3.1",
+    "version": "1.3.1ss",
     "description": "Web3 ETH2 Beacon chain API wrappers.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth2-beaconchain",
     "license": "LGPL-3.0",
@@ -10,27 +10,18 @@
     "types": "types.ts",
     "scripts": {
         "test": "jest",
-        "tsc": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline",
-        "type-check": "tsc --noEmit",
-        "type-check:watch": "npm run type-check -- --watch"
+        "tsc": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline"
     },
     "main": "lib/index.js",
     "dependencies": {
         "web3-eth2-core": "^1.3.0"
     },
     "devDependencies": {
-        "@babel/cli": "^7.12.10",
-        "@babel/core": "^7.12.10",
-        "@babel/plugin-proposal-class-properties": "^7.12.1",
-        "@babel/plugin-transform-runtime": "^7.12.10",
-        "@babel/preset-env": "^7.12.11",
-        "@babel/preset-typescript": "^7.12.7",
-        "@babel/runtime": "^7.12.5",
         "@chainsafe/lodestar-types": "^0.13.0",
         "@types/jest": "^26.0.14",
         "@types/node": "^14.11.2",
-        "babel-jest": "^26.6.3",
         "jest": "^26.4.2",
+        "ts-jest": "^26.4.1",
         "typescript": "^4.0.3"
     }
 }
@@ -1,6 +1,6 @@
-import { BaseAPISchema } from 'web3-eth2-core'
+import { IBaseAPISchema } from '../../web3-eth2-core/src/schema'
 
-export const DefaultSchema: BaseAPISchema = {
+export const DefaultSchema: IBaseAPISchema = {
     packageName: 'eth2-beaconchain',
     routePrefix: '/eth/v1/beacon/',
     methods: [

@@ -0,0 +1,3 @@
+import jest from 'jest'
+
+export const get = jest.fn(() => Promise.resolve({ data: {} }))
@@ -5,7 +5,11 @@ const providerSuffix = '/eth/v1/beacon/'
 
 it('constructs a ETH2BeaconChain instance with expected properties', () => {
     const eth2BeaconChain = new ETH2BeaconChain(provider)
+
+    // @ts-ignore - types not full implemented yet
     expect(eth2BeaconChain.name).toBe('eth2-beaconchain')
+    // @ts-ignore - types not full implemented yet
     expect(eth2BeaconChain.provider).toBe(`${provider}${providerSuffix}`)
+    // @ts-ignore - types not full implemented yet
     expect(eth2BeaconChain.protectProvider)
 })
@@ -135,7 +135,7 @@ it('getValidatorBalances', async () => {
     expect(response[0]).toMatchObject(expectedResponse)
 })
 
-xit('getEpochCommittees', async () => {
+it('getEpochCommittees', async () => {
     const routeParameters = {
         stateId: 'head',
         epoch: ''

@@ -1,70 +1,21 @@
 {
   "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig.json to read more about this file */
-
-    /* Basic Options */
-    // "incremental": true,                   /* Enable incremental compilation */
-    "target": "esnext",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-    // "lib": [],                             /* Specify library files to be included in the compilation. */
-    // "allowJs": true,                       /* Allow javascript files to be compiled. */
-    // "checkJs": true,                       /* Report errors in .js files. */
-    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    // "declaration": true,                      /* Generates corresponding '.d.ts' file. */
-    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
-    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
-    // "outFile": "./",                       /* Concatenate and emit output to single file. */
-    "outDir": "lib",                          /* Redirect output structure to the directory. */
-    // "rootDir": "./src",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    // "composite": true,                     /* Enable project compilation */
-    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
-    // "removeComments": true,                /* Do not emit comments to output. */
-    // "noEmit": true,                        /* Do not emit outputs. */
-    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
-    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
-    /* Strict Type-Checking Options */
-    "strict": true,                           /* Enable all strict type-checking options. */
-    "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-    "strictNullChecks": true,              /* Enable strict null checks. */
-    "strictFunctionTypes": true,           /* Enable strict checking of function types. */
-    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-    "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
-    "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
-
-    /* Additional Checks */
-    // "noUnusedLocals": true,                /* Report errors on unused locals. */
-    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
-    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
-    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
-
-    /* Module Resolution Options */
-    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
-    "paths": {"web3-eth2-beaconchain": ["."]},    /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "typeRoots": [],                       /* List of folders to include type definitions from. */
-    // "types": [],                           /* Type declaration files to be included in compilation. */
-    "allowSyntheticDefaultImports": true,     /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
-    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
-
-    /* Source Map Options */
-    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
-    /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
-    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
-
-    /* Advanced Options */
-    "skipLibCheck": true,                     /* Skip type checking of declaration files. */
-    "forceConsistentCasingInFileNames": true  /* Disallow inconsistently-cased references to the same file. */
-  },
-  "exclude": ["./test"]
-}
+    "declaration": true,
+    "outDir": "lib",
+    "strict": true,
+    "esModuleInterop": true,
+    "module": "commonjs",
+    "lib": ["es6"],
+    "target": "es6",
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "noEmit": true,
+    "allowSyntheticDefaultImports": false,
+    "baseUrl": ".",
+    "paths": {
+        "web3-eth2-beaconchain": ["."]
+    }
+  }
+}
@@ -1,9 +1,8 @@
+
 {
-  "presets": [
-    "@babel/preset-env",
-    "@babel/preset-typescript"
-  ],
-  "plugins": [
-    "@babel/plugin-proposal-class-properties"
-  ]
-}
+    "presets": ["@babel/env", "@babel/typescript"],
+    "plugins": [
+      "@babel/proposal-class-properties",
+      "@babel/proposal-object-rest-spread"
+    ]
+  }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import jest from 'jest'

		export const get = jest.fn(() => Promise.resolve({ data: {} }))