quantus/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Existent empty storage returns null (#231)

Browse Source 
* Existent empty storage returns null

* Update index.ts
This commit is contained in:
Jaco Greeff
2018-10-09 17:45:07 +02:00
committed by GitHub
parent 84ef15159c
commit e8c834f5ee
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-observable/src/Combined.ts
+7 -5
View File
@@ -135,11 +135,12 @@ export default class ApiCombined extends ApiCalls {
this.sessionsPerEra(),
this.eraLastLengthChange()
],
([sessionBlockProgress, sessionLength, sessionCurrentIndex, sessionsPerEra, eraLastLengthChange = new BlockNumber(0)]: [BlockNumber | undefined, BlockNumber | undefined, BlockNumber | undefined, BlockNumber | undefined, BlockNumber | undefined]): BlockNumber | undefined =>
sessionsPerEra && sessionCurrentIndex && sessionLength && sessionBlockProgress && eraLastLengthChange
([sessionBlockProgress, sessionLength, sessionCurrentIndex, sessionsPerEra, eraLastLengthChange]: [BlockNumber | undefined, BlockNumber | undefined, BlockNumber | undefined, BlockNumber | undefined, BlockNumber | undefined]): BlockNumber | undefined =>
sessionsPerEra && sessionCurrentIndex && sessionLength && sessionBlockProgress
? new BlockNumber(
sessionCurrentIndex
.sub(eraLastLengthChange)
// last era can be null (i.e. new chain, valid key, no value set yet)
.sub(eraLastLengthChange || new BlockNumber(0))
.mod(sessionsPerEra.toBn())
.mul(sessionLength.toBn())
.add(sessionBlockProgress.toBn())
@@ -171,10 +172,11 @@ export default class ApiCombined extends ApiCalls {
this.sessionLastLengthChange()
],
([bestNumber, sessionLength, lastSessionLengthChange]: [BlockNumber | undefined, BlockNumber | undefined, BlockNumber | undefined]): BlockNumber | undefined =>
bestNumber && sessionLength && lastSessionLengthChange
bestNumber && sessionLength
? new BlockNumber(
bestNumber
.sub(lastSessionLengthChange)
// last change can be null (i.e. new chain, valid key, no value set yet)
.sub(lastSessionLengthChange || new BlockNumber(0))
.add(sessionLength.toBn())
.mod(sessionLength.toBn())
)