Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ae1de13
feat: chainSpec based controller config; Types from apps-config
emostov Nov 24, 2020
5d254dd
Update mock api to include derive getBlock - specs work
emostov Nov 24, 2020
7072fdc
Update to reflect TS 4.1
emostov Nov 24, 2020
c682665
Clean up comments
emostov Nov 24, 2020
4ab1b2d
Save
emostov Dec 2, 2020
cc9a962
Merge origin master
emostov Dec 2, 2020
ede1787
feat: Token query param for non-native token balance-info
emostov Dec 2, 2020
39e1a1a
Revert package.json
emostov Dec 2, 2020
be66056
Initial reply david review
emostov Dec 2, 2020
e465092
Update src/main.ts
emostov Dec 2, 2020
19a66e7
Remove kulupu controller
emostov Dec 2, 2020
0ac5573
Merge branch 'types-package' of https://github.com/paritytech/substra…
emostov Dec 2, 2020
c5e9284
Add chain builder integration guide
emostov Dec 3, 2020
0c57ecd
Patch CHAIN_INTEGRATION.md
emostov Dec 3, 2020
6692e50
Apply suggestions from code review
emostov Dec 4, 2020
4b4d9a2
Update CHAIN_INTEGRATION.md
emostov Dec 4, 2020
b81c0d1
Bump deps
emostov Dec 8, 2020
46f067d
Merge remote-tracking branch 'origin' into types-package
emostov Dec 8, 2020
92a8856
Use whole options object for controller creation
emostov Dec 8, 2020
8451309
Apply suggestions from code review
emostov Dec 9, 2020
87572a9
Respond to maciej feedback
emostov Dec 9, 2020
c38c105
Merge branch 'types-package' of https://github.com/paritytech/substra…
emostov Dec 9, 2020
a1a988a
Update chain integration guide
emostov Dec 9, 2020
79f9eb8
Remove excessive nullish colescing operators
emostov Dec 9, 2020
cf84d63
Merge origin master
emostov Dec 9, 2020
b34cca2
Fix merge issue
emostov Dec 9, 2020
a16235a
Update CHAIN_INTEGRATION.md
emostov Dec 9, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge origin master
  • Loading branch information
emostov committed Dec 2, 2020
commit cc9a96249a28c72ed09d9943ca6443d516920bb4
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"test": "jest --silent"
},
"dependencies": {
"@polkadot/api": "^2.8.1",
"@polkadot/api": "^2.9.1",
"@polkadot/apps-config": "^0.68.1",
"@polkadot/util-crypto": "^4.2.1",
"@substrate/calc": "^0.1.2",
Expand All @@ -54,14 +54,14 @@
"@types/jest": "^26.0.16",
"@types/morgan": "^1.9.2",
"@types/triple-beam": "^1.3.2",
"@typescript-eslint/eslint-plugin": "^4.8.2",
"@typescript-eslint/parser": "^4.8.2",
"@typescript-eslint/eslint-plugin": "4.9.0",
"@typescript-eslint/parser": "4.9.0",
"eslint": "^7.14.0",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-simple-import-sort": "^6.0.1",
"jest": "^26.6.3",
"prettier": "^2.2.0",
"prettier": "^2.2.1",
"rimraf": "^3.0.2",
"standard-version": "^9.0.0",
"ts-jest": "^26.4.4",
Expand Down
1 change: 1 addition & 0 deletions src/controllers/AbstractControllers.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const api = {
},
};

// eslint-disable-next-line @typescript-eslint/no-unused-vars
const MockController = class MockController extends AbstractController<AbstractService> {
protected initRoutes(): void {
throw new Error('Method not implemented.');
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/pallets/PalletsStorageController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import AbstractController from '../AbstractController';
*
* See `docs/src/openapi-v1.yaml` for usage information.
*/
export default class PalletsStorageItemController extends AbstractController<PalletsStorageItemService> {
export default class PalletsStorageController extends AbstractController<PalletsStorageService> {
constructor(api: ApiPromise) {
super(
api,
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/pallets/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export { default as PalletsStakingProgress } from './PalletsStakingProgressController';
export { default as PalletsStorageItem } from './PalletsStorageItemController';
export { default as palletsStakingProgress } from './PalletsStakingProgressController';
export { default as palletsStorageItem } from './PalletsStorageController';
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.