Skip to content

Commit d19882c

Browse files
committed
revert borrowing and derefrencing because of concerning error
1 parent 913c9b6 commit d19882c

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

contracts/FlowTransactionScheduler.cdc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ access(all) contract FlowTransactionScheduler {
10541054
}
10551055

10561056
// Add this transaction id to the slot
1057-
let transactionsForSlot = self.slotQueue[slot]! //as auth(Mutate) &{Priority: {UInt64: UInt64}}
1057+
let transactionsForSlot = self.slotQueue[slot]!
10581058
if let priorityQueue = transactionsForSlot[txData.priority] {
10591059
priorityQueue[txData.id] = txData.executionEffort
10601060
transactionsForSlot[txData.priority] = priorityQueue
@@ -1128,7 +1128,6 @@ access(all) contract FlowTransactionScheduler {
11281128
// Subtract the execution effort for this transaction from the slot's priority
11291129
let slotEfforts = &self.slotUsedEffort[slot]! as auth(Mutate) &{Priority: UInt64}
11301130
slotEfforts[Priority.Low] = slotEfforts[Priority.Low]!.saturatingSubtract(effort)
1131-
//self.slotUsedEffort[slot] = slotEfforts
11321131

11331132
// Update the transaction's scheduled timestamp and add it back to the slot queue
11341133
transactionData.setScheduledTimestamp(newTimestamp: newTimestamp)
@@ -1147,18 +1146,17 @@ access(all) contract FlowTransactionScheduler {
11471146
let transactionObject = self.transactions.remove(key: transactionID)!
11481147

11491148
// garbage collect slots
1150-
let transactionQueue = &self.slotQueue[slot]! as auth(Mutate) &{Priority: {UInt64: UInt64}}
1149+
let transactionQueue = self.slotQueue[slot]!
11511150

1152-
if let priorityQueue = *transactionQueue[transactionPriority] {
1151+
if let priorityQueue = transactionQueue[transactionPriority] {
11531152
priorityQueue[transactionID] = nil
11541153
if priorityQueue.keys.length == 0 {
11551154
transactionQueue.remove(key: transactionPriority)
11561155
} else {
11571156
transactionQueue[transactionPriority] = priorityQueue
11581157
}
1159-
1160-
//self.slotQueue[slot] = transactionQueue
11611158
}
1159+
self.slotQueue[slot] = transactionQueue
11621160

11631161
// if the slot is now empty remove it from the maps
11641162
if transactionQueue.keys.length == 0 {

lib/go/contracts/internal/assets/assets.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)