Skip to content

Commit 1b892c0

Browse files
committed
refactor(renterd): min account expiry and min price table validity units
1 parent 63e1c9f commit 1b892c0

File tree

6 files changed

+27
-17
lines changed

6 files changed

+27
-17
lines changed

.changeset/rich-rats-try.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'renterd': minor
3+
---
4+
5+
The min account expiry and min price table validity configuration settings are now stored in milliseconds.

.changeset/spicy-dots-wait.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@siafoundation/units': minor
3+
---
4+
5+
Add and remove time methods.

apps/renterd/contexts/config/transform.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,9 @@ describe('tansforms', () => {
270270
maxRPCPrice: '99970619000000000000000000',
271271
maxStoragePrice: '210531181019',
272272
maxUploadPrice: '1000232323000000',
273-
minAccountExpiry: 86400000000000,
273+
minAccountExpiry: 86400000,
274274
minMaxEphemeralAccountBalance: '1000000000000000000000000',
275-
minPriceTableValidity: 300000000000,
275+
minPriceTableValidity: 300000,
276276
})
277277
})
278278
})
@@ -503,9 +503,9 @@ function buildAllResponses() {
503503
maxRPCPrice: '99970619000000000000000000',
504504
maxStoragePrice: '210531181019',
505505
maxUploadPrice: '1000232323000000',
506-
minAccountExpiry: 86400000000000,
506+
minAccountExpiry: 86400000,
507507
minMaxEphemeralAccountBalance: '1000000000000000000000000',
508-
minPriceTableValidity: 300000000000,
508+
minPriceTableValidity: 300000,
509509
} as SettingsGouging,
510510
pinned: {
511511
currency: 'usd' as CurrencyId,

apps/renterd/contexts/config/transformDown.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {
88
import {
99
blocksToWeeks,
1010
bytesToTB,
11-
nanosecondsInDays,
12-
nanosecondsInMinutes,
11+
millisecondsInDays,
12+
millisecondsInMinutes,
1313
toSiacoins,
1414
valuePerBytePerBlockToPerTBPerMonth,
1515
valuePerByteToPerTB,
@@ -106,10 +106,10 @@ export function transformDownGouging({
106106
),
107107
hostBlockHeightLeeway: new BigNumber(gouging.hostBlockHeightLeeway),
108108
minPriceTableValidityMinutes: new BigNumber(
109-
nanosecondsInMinutes(gouging.minPriceTableValidity)
109+
millisecondsInMinutes(gouging.minPriceTableValidity)
110110
),
111111
minAccountExpiryDays: new BigNumber(
112-
nanosecondsInDays(gouging.minAccountExpiry)
112+
millisecondsInDays(gouging.minAccountExpiry)
113113
),
114114
minMaxEphemeralAccountBalance: toSiacoins(
115115
gouging.minMaxEphemeralAccountBalance,

apps/renterd/contexts/config/transformUp.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import {
1111
valuePerTBPerMonthToPerBytePerBlock,
1212
valuePerMonthToPerPeriod,
1313
valuePerMillionToPerOne,
14-
daysInNanoseconds,
15-
minutesInNanoseconds,
1614
valuePerTBToPerByte,
15+
minutesInMilliseconds,
16+
daysInMilliseconds,
1717
} from '@siafoundation/units'
1818
import {
1919
getAdvancedDefaultsAutopilot,
@@ -102,10 +102,10 @@ export function transformUpGouging(
102102
maxContractPrice: toHastings(v.maxContractPrice).toString(),
103103
hostBlockHeightLeeway: Math.round(v.hostBlockHeightLeeway.toNumber() || 0),
104104
minPriceTableValidity: Math.round(
105-
minutesInNanoseconds(v.minPriceTableValidityMinutes.toNumber() || 0)
105+
minutesInMilliseconds(v.minPriceTableValidityMinutes.toNumber() || 0)
106106
),
107107
minAccountExpiry: Math.round(
108-
daysInNanoseconds(v.minAccountExpiryDays.toNumber())
108+
daysInMilliseconds(v.minAccountExpiryDays.toNumber())
109109
),
110110
minMaxEphemeralAccountBalance: toHastings(
111111
v.minMaxEphemeralAccountBalance

libs/units/src/time.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ export function nowInMilliseconds() {
3030
return new Date().getTime()
3131
}
3232

33-
export function nanosecondsInMinutes(ns: number) {
34-
return ns / 1000 / 1000 / 1000 / 60
33+
export function millisecondsInMinutes(ms: number) {
34+
return ms / 1000 / 60
3535
}
3636

3737
export function millisecondsInHours(ms: number) {
38-
return ms / 1000 / 1000 / 60 / 60
38+
return ms / 1000 / 60 / 60
3939
}
4040

41-
export function millisecondsInMinutes(ms: number) {
42-
return ms / 1000 / 60
41+
export function millisecondsInDays(ms: number) {
42+
return ms / 1000 / 60 / 60 / 24
4343
}
4444

4545
export function microsecondsInMinutes(us: number) {

0 commit comments

Comments
 (0)