Skip to content

Commit b61341e

Browse files
committed
refactor: renterd account reset drift moved to worker
1 parent dd1b403 commit b61341e

File tree

7 files changed

+48
-35
lines changed

7 files changed

+48
-35
lines changed

.changeset/cold-trees-relate.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@siafoundation/renterd-js': minor
3+
'@siafoundation/renterd-react': minor
4+
'@siafoundation/renterd-types': minor
5+
---
6+
7+
The account reset drift API was moved from bus to worker.

libs/renterd-js/src/bus.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
import {
2-
AccountResetDriftParams,
3-
AccountResetDriftPayload,
4-
AccountResetDriftResponse,
52
AlertsDismissParams,
63
AlertsDismissPayload,
74
AlertsDismissResponse,
@@ -212,7 +209,6 @@ import {
212209
WalletUtxoParams,
213210
WalletUtxoPayload,
214211
WalletUtxoResponse,
215-
busAccountIdResetdriftRoute,
216212
busAlertsDismissRoute,
217213
busAlertsRoute,
218214
busBucketNamePolicyRoute,
@@ -419,11 +415,6 @@ export function Bus({ api, password }: { api: string; password?: string }) {
419415
HostResetLostSectorCountPayload,
420416
HostResetLostSectorCountResponse
421417
>(axios, 'post', busHostPublicKeyResetlostsectorsRoute),
422-
accountResetDrift: buildRequestHandler<
423-
AccountResetDriftParams,
424-
AccountResetDriftPayload,
425-
AccountResetDriftResponse
426-
>(axios, 'post', busAccountIdResetdriftRoute),
427418
contracts: buildRequestHandler<
428419
ContractsParams,
429420
ContractsPayload,

libs/renterd-js/src/worker.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import {
2+
AccountResetDriftParams,
3+
AccountResetDriftPayload,
4+
AccountResetDriftResponse,
25
MultipartUploadPartParams,
36
MultipartUploadPartPayload,
47
MultipartUploadPartResponse,
@@ -14,6 +17,7 @@ import {
1417
WorkerStateParams,
1518
WorkerStatePayload,
1619
WorkerStateResponse,
20+
workerAccountIdResetdriftRoute,
1721
workerMultipartKeyRoute,
1822
workerObjectsKeyRoute,
1923
workerRhpScanRoute,
@@ -66,5 +70,10 @@ export function Worker({ api, password }: { api: string; password?: string }) {
6670
RhpScanPayload,
6771
RhpScanResponse
6872
>(axios, 'post', workerRhpScanRoute),
73+
accountResetDrift: buildRequestHandler<
74+
AccountResetDriftParams,
75+
AccountResetDriftPayload,
76+
AccountResetDriftResponse
77+
>(axios, 'post', workerAccountIdResetdriftRoute),
6978
}
7079
}

libs/renterd-react/src/bus.ts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ import {
1515
getTestnetZenBlockHeight,
1616
} from '@siafoundation/units'
1717
import {
18-
AccountResetDriftParams,
19-
AccountResetDriftPayload,
20-
AccountResetDriftResponse,
2118
AlertsDismissParams,
2219
AlertsDismissPayload,
2320
AlertsDismissResponse,
@@ -185,7 +182,6 @@ import {
185182
WalletTransactionsResponse,
186183
WalletUtxoParams,
187184
WalletUtxoResponse,
188-
busAccountIdResetdriftRoute,
189185
busBucketRoute,
190186
busBucketNamePolicyRoute,
191187
busBucketNameRoute,
@@ -582,21 +578,6 @@ export function useHostResetLostSectorCount(
582578
})
583579
}
584580

585-
// accounts
586-
587-
export function useAccountResetDrift(
588-
args?: HookArgsCallback<
589-
AccountResetDriftParams,
590-
AccountResetDriftPayload,
591-
AccountResetDriftResponse
592-
>
593-
) {
594-
return usePostFunc({
595-
...args,
596-
route: busAccountIdResetdriftRoute,
597-
})
598-
}
599-
600581
// contracts
601582

602583
export function useContracts(

libs/renterd-react/src/worker.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import {
88
useGetSwr,
99
} from '@siafoundation/react-core'
1010
import {
11+
AccountResetDriftParams,
12+
AccountResetDriftPayload,
13+
AccountResetDriftResponse,
1114
AutopilotHost,
1215
Host,
1316
MultipartUploadPartParams,
@@ -27,6 +30,7 @@ import {
2730
autopilotHostsRoute,
2831
busObjectsRoute,
2932
busSearchHostsRoute,
33+
workerAccountIdResetdriftRoute,
3034
workerMultipartKeyRoute,
3135
workerObjectsKeyRoute,
3236
workerRhpScanRoute,
@@ -170,3 +174,18 @@ export function useRhpScan(
170174
}
171175
)
172176
}
177+
178+
// accounts
179+
180+
export function useAccountResetDrift(
181+
args?: HookArgsCallback<
182+
AccountResetDriftParams,
183+
AccountResetDriftPayload,
184+
AccountResetDriftResponse
185+
>
186+
) {
187+
return usePostFunc({
188+
...args,
189+
route: workerAccountIdResetdriftRoute,
190+
})
191+
}

libs/renterd-types/src/bus.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ export const busHostsBlocklistRoute = '/bus/hosts/blocklist'
4848
export const busHostsAllowlistRoute = '/bus/hosts/allowlist'
4949
export const busHostPublicKeyResetlostsectorsRoute =
5050
'/bus/host/:publicKey/resetlostsectors'
51-
export const busAccountIdResetdriftRoute = '/bus/account/:id/resetdrift'
5251
export const busContractsRoute = '/bus/contracts'
5352
export const busContractIdAcquireRoute = '/bus/contract/:id/acquire'
5453
export const busContractIdReleaseRoute = '/bus/contract/:id/release'
@@ -285,12 +284,6 @@ export type HostResetLostSectorCountParams = {
285284
export type HostResetLostSectorCountPayload = void
286285
export type HostResetLostSectorCountResponse = void
287286

288-
// accounts
289-
290-
export type AccountResetDriftParams = { id: string }
291-
export type AccountResetDriftPayload = void
292-
export type AccountResetDriftResponse = void
293-
294287
// contracts
295288

296289
export type ContractsParams = void

libs/renterd-types/src/worker.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export const workerStateRoute = '/worker/state'
55
export const workerObjectsKeyRoute = '/worker/objects/:key'
66
export const workerMultipartKeyRoute = '/worker/multipart/:key'
77
export const workerRhpScanRoute = '/worker/rhp/scan'
8+
export const workerAccountIdResetdriftRoute = '/worker/account/:id/resetdrift'
89

910
// state
1011

@@ -14,6 +15,8 @@ export type WorkerStateResponse = BusStateResponse & {
1415
id: string
1516
}
1617

18+
// objects
19+
1720
export type ObjectDownloadParams = { key: string; bucket: string }
1821
export type ObjectDownloadPayload = void
1922
export type ObjectDownloadResponse = Blob
@@ -28,6 +31,8 @@ export type ObjectUploadPayload =
2831
| Record<string, unknown>
2932
export type ObjectUploadResponse = void
3033

34+
// multipart
35+
3136
export type MultipartUploadPartParams = {
3237
key: string
3338
uploadid: string
@@ -41,6 +46,8 @@ export type MultipartUploadPartParams = {
4146
export type MultipartUploadPartPayload = Blob | Buffer | ArrayBuffer | string
4247
export type MultipartUploadPartResponse = void
4348

49+
// rhp
50+
4451
export type RhpScanParams = void
4552
export type RhpScanPayload = {
4653
hostKey: string
@@ -52,3 +59,9 @@ export type RhpScanResponse = {
5259
scanError?: string
5360
settings?: HostSettings
5461
}
62+
63+
// accounts
64+
65+
export type AccountResetDriftParams = { id: string }
66+
export type AccountResetDriftPayload = void
67+
export type AccountResetDriftResponse = void

0 commit comments

Comments
 (0)