Skip to content

Commit

Permalink
fix: calculateLockExpirationStatus method signature
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Faust committed Feb 28, 2020
1 parent d9631fb commit fc67202
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions packages/core-utils/src/lock-expiration-calculator.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
import { app } from "@arkecosystem/core-container";
import { State } from "@arkecosystem/core-interfaces";
import { Enums, Interfaces } from "@arkecosystem/crypto";

export const calculateLockExpirationStatus = (expiration: Interfaces.IHtlcExpiration): boolean => {
const lastBlock: Interfaces.IBlock = app
.resolvePlugin<State.IStateService>("state")
.getStore()
.getLastBlock();

return (
(expiration.type === Enums.HtlcLockExpirationType.EpochTimestamp &&
expiration.value <= lastBlock.data.timestamp) ||
(expiration.type === Enums.HtlcLockExpirationType.BlockHeight && expiration.value <= lastBlock.data.height)
);
};
export const calculateLockExpirationStatus = (
lastBlock: Interfaces.IBlock,
expiration: Interfaces.IHtlcExpiration,
): boolean =>
(expiration.type === Enums.HtlcLockExpirationType.EpochTimestamp && expiration.value <= lastBlock.data.timestamp) ||
(expiration.type === Enums.HtlcLockExpirationType.BlockHeight && expiration.value <= lastBlock.data.height);

0 comments on commit fc67202

Please sign in to comment.