Skip to content

Commit

Permalink
chore: Remove some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
MicroProofs committed Sep 18, 2023
1 parent 219d7f2 commit 364c677
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion lib/hardfork.ak
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use aiken/transaction.{InlineDatum, Output}
use aiken/transaction/value.{Value}
use fortuna/types.{State}
use fortuna/utils.{quantity_of}
use hardfork/hftypes.{ForkDatum, GlobalLockState, LockStateType, Miner, Regular}
use hardfork/hftypes.{ForkDatum, GlobalLockState, LockStateType, MinerOp, Regular}

pub fn calculate_emission(block_height: Int) -> Int {
todo
Expand Down
2 changes: 1 addition & 1 deletion lib/hardfork/hftypes.ak
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pub type HardForkStatus {
}

pub type LockStateType {
Miner(ByteArray)
MinerOp(ByteArray)
Regular
}

Expand Down
10 changes: 5 additions & 5 deletions validators/hard_fork.ak
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use fortuna/utils.{list_at, quantity_of}
use hardfork
use hardfork/hftypes.{
FailedFork, ForkDatum, Forked, GlobalLockState, HardForkState, LockStateType,
Miner, NftState, NotForked, Regular,
MinerOp, NftState, NotForked, Regular,
}

type TunaAction {
Expand Down Expand Up @@ -342,7 +342,7 @@ validator(
}
}

pub type NftForkAction {
type NftForkAction {
Initialize
Lock {
hard_fork_state_ref: OutputReference,
Expand Down Expand Up @@ -444,7 +444,7 @@ validator(init_utxo_ref: OutputReference, fortuna_v1_hash: ByteArray) {

expect GlobalLockState {
locked_tuna: 0,
lock_state_type: Miner(readiness),
lock_state_type: MinerOp(readiness),
}: ForkDatum = miner_state_datum

expect GlobalLockState { locked_tuna: 0, lock_state_type: Regular }: ForkDatum =
Expand Down Expand Up @@ -661,8 +661,8 @@ validator(init_utxo_ref: OutputReference, fortuna_v1_hash: ByteArray) {
prev_held_tuna < out_locked_tuna,
// Check Lock type and status
when lock_type is {
Miner(in_miner_signal) -> {
expect Miner(out_miner_signal) = out_lock_state_type
MinerOp(in_miner_signal) -> {
expect MinerOp(out_miner_signal) = out_lock_state_type

and {
// Fork Lock(5) requirement: Lock state output has correct miner readiness
Expand Down

0 comments on commit 364c677

Please sign in to comment.