1
1
import { ControllerMessenger } from '@metamask/base-controller' ;
2
2
3
- import type { PollingCompleteType } from './PollingController' ;
4
- import PollingController from './PollingController' ;
3
+ import { PollingController } from './PollingController' ;
5
4
6
5
const TICK_TIME = 1000 ;
7
6
@@ -27,7 +26,6 @@ describe('PollingController', () => {
27
26
metadata : { } ,
28
27
name : 'PollingController' ,
29
28
state : { foo : 'bar' } ,
30
- pollingIntervalLength : TICK_TIME ,
31
29
} ) ;
32
30
controller . start ( 'mainnet' ) ;
33
31
jest . advanceTimersByTime ( TICK_TIME ) ;
@@ -48,7 +46,6 @@ describe('PollingController', () => {
48
46
metadata : { } ,
49
47
name : 'PollingController' ,
50
48
state : { foo : 'bar' } ,
51
- pollingIntervalLength : TICK_TIME ,
52
49
} ) ;
53
50
const pollingToken = controller . start ( 'mainnet' ) ;
54
51
jest . advanceTimersByTime ( TICK_TIME ) ;
@@ -69,7 +66,6 @@ describe('PollingController', () => {
69
66
metadata : { } ,
70
67
name : 'PollingController' ,
71
68
state : { foo : 'bar' } ,
72
- pollingIntervalLength : TICK_TIME ,
73
69
} ) ;
74
70
const pollingToken1 = controller . start ( 'mainnet' ) ;
75
71
controller . start ( 'mainnet' ) ;
@@ -93,7 +89,6 @@ describe('PollingController', () => {
93
89
metadata : { } ,
94
90
name : 'PollingController' ,
95
91
state : { foo : 'bar' } ,
96
- pollingIntervalLength : TICK_TIME ,
97
92
} ) ;
98
93
controller . start ( 'mainnet' ) ;
99
94
expect ( ( ) => {
@@ -113,7 +108,6 @@ describe('PollingController', () => {
113
108
metadata : { } ,
114
109
name : 'PollingController' ,
115
110
state : { foo : 'bar' } ,
116
- pollingIntervalLength : TICK_TIME ,
117
111
} ) ;
118
112
controller . start ( 'mainnet' ) ;
119
113
expect ( ( ) => {
@@ -136,7 +130,6 @@ describe('PollingController', () => {
136
130
metadata : { } ,
137
131
name : 'PollingController' ,
138
132
state : { foo : 'bar' } ,
139
- pollingIntervalLength : TICK_TIME ,
140
133
} ) ;
141
134
controller . start ( 'mainnet' ) ;
142
135
jest . advanceTimersByTime ( TICK_TIME ) ;
@@ -158,7 +151,6 @@ describe('PollingController', () => {
158
151
metadata : { } ,
159
152
name : 'PollingController' ,
160
153
state : { foo : 'bar' } ,
161
- pollingIntervalLength : TICK_TIME ,
162
154
} ) ;
163
155
controller . start ( 'mainnet' ) ;
164
156
controller . start ( 'mainnet' ) ;
@@ -177,25 +169,20 @@ describe('PollingController', () => {
177
169
}
178
170
const name = 'PollingController' ;
179
171
180
- const mockMessenger = new ControllerMessenger <
181
- any ,
182
- PollingCompleteType < typeof name >
183
- > ( ) ;
184
-
185
- mockMessenger . subscribe ( `${ name } :pollingComplete` , pollingComplete ) ;
172
+ const mockMessenger = new ControllerMessenger < any , any > ( ) ;
186
173
187
174
const controller = new MyGasFeeController ( {
188
175
messenger : mockMessenger ,
189
176
metadata : { } ,
190
177
name,
191
178
state : { foo : 'bar' } ,
192
- pollingIntervalLength : TICK_TIME ,
193
179
} ) ;
180
+ controller . onPollingComplete ( 'mainnet' , pollingComplete ) ;
194
181
const pollingToken = controller . start ( 'mainnet' ) ;
195
182
controller . stop ( pollingToken ) ;
196
183
expect ( pollingComplete ) . toHaveBeenCalledTimes ( 1 ) ;
197
184
} ) ;
198
- it ( 'should poll at the interval length passed via the constructor ' , async ( ) => {
185
+ it ( 'should poll at the interval length when set via setIntervalLength ' , async ( ) => {
199
186
jest . useFakeTimers ( ) ;
200
187
201
188
class MyGasFeeController extends PollingController < any , any , any > {
@@ -208,8 +195,8 @@ describe('PollingController', () => {
208
195
metadata : { } ,
209
196
name : 'PollingController' ,
210
197
state : { foo : 'bar' } ,
211
- pollingIntervalLength : TICK_TIME * 3 ,
212
198
} ) ;
199
+ controller . setIntervalLength ( TICK_TIME * 3 ) ;
213
200
controller . start ( 'mainnet' ) ;
214
201
jest . advanceTimersByTime ( TICK_TIME ) ;
215
202
await Promise . resolve ( ) ;
@@ -238,7 +225,6 @@ describe('PollingController', () => {
238
225
metadata : { } ,
239
226
name : 'PollingController' ,
240
227
state : { foo : 'bar' } ,
241
- pollingIntervalLength : TICK_TIME ,
242
228
} ) ;
243
229
controller . start ( 'mainnet' ) ;
244
230
controller . start ( 'rinkeby' ) ;
@@ -259,7 +245,7 @@ describe('PollingController', () => {
259
245
controller . stopAll ( ) ;
260
246
} ) ;
261
247
262
- it ( 'should poll multiple networkClientIds at the interval length passed via the constructor ' , async ( ) => {
248
+ it ( 'should poll multiple networkClientIds when setting interval length' , async ( ) => {
263
249
jest . useFakeTimers ( ) ;
264
250
265
251
class MyGasFeeController extends PollingController < any , any , any > {
@@ -272,8 +258,8 @@ describe('PollingController', () => {
272
258
metadata : { } ,
273
259
name : 'PollingController' ,
274
260
state : { foo : 'bar' } ,
275
- pollingIntervalLength : TICK_TIME * 2 ,
276
261
} ) ;
262
+ controller . setIntervalLength ( TICK_TIME * 2 ) ;
277
263
controller . start ( 'mainnet' ) ;
278
264
jest . advanceTimersByTime ( TICK_TIME ) ;
279
265
await Promise . resolve ( ) ;
0 commit comments