@@ -55,9 +55,7 @@ type Mocks = {
55
55
} ;
56
56
57
57
function mockAccountProvider < Provider > (
58
- providerClass : new (
59
- messenger : MultichainAccountServiceMessenger ,
60
- ) => Provider ,
58
+ providerClass : new ( messenger : MultichainAccountServiceMessenger ) => Provider ,
61
59
mocks : MockAccountProvider ,
62
60
accounts : InternalAccount [ ] ,
63
61
type : KeyringAccount [ 'type' ] ,
@@ -83,7 +81,7 @@ function setup({
83
81
keyrings ?: KeyringObject [ ] ;
84
82
accounts ?: InternalAccount [ ] ;
85
83
} = { } ) : {
86
- controller : MultichainAccountService ;
84
+ service : MultichainAccountService ;
87
85
messenger : Messenger <
88
86
MultichainAccountServiceActions | AllowedActions ,
89
87
MultichainAccountServiceEvents | AllowedEvents
@@ -133,18 +131,18 @@ function setup({
133
131
) ;
134
132
}
135
133
136
- const controller = new MultichainAccountService ( {
134
+ const service = new MultichainAccountService ( {
137
135
messenger : getMultichainAccountServiceMessenger ( messenger ) ,
138
136
} ) ;
139
- controller . init ( ) ;
137
+ service . init ( ) ;
140
138
141
- return { controller , messenger, mocks } ;
139
+ return { service , messenger, mocks } ;
142
140
}
143
141
144
142
describe ( 'MultichainAccountService' , ( ) => {
145
143
describe ( 'getMultichainAccounts' , ( ) => {
146
144
it ( 'gets multichain accounts' , ( ) => {
147
- const { controller } = setup ( {
145
+ const { service } = setup ( {
148
146
accounts : [
149
147
// Wallet 1:
150
148
MockAccountBuilder . from ( MOCK_HD_ACCOUNT_1 )
@@ -167,19 +165,19 @@ describe('MultichainAccountService', () => {
167
165
} ) ;
168
166
169
167
expect (
170
- controller . getMultichainAccounts ( {
168
+ service . getMultichainAccounts ( {
171
169
entropySource : MOCK_HD_KEYRING_1 . metadata . id ,
172
170
} ) ,
173
171
) . toHaveLength ( 1 ) ;
174
172
expect (
175
- controller . getMultichainAccounts ( {
173
+ service . getMultichainAccounts ( {
176
174
entropySource : MOCK_HD_KEYRING_2 . metadata . id ,
177
175
} ) ,
178
176
) . toHaveLength ( 1 ) ;
179
177
} ) ;
180
178
181
179
it ( 'gets multichain accounts with multiple wallets' , ( ) => {
182
- const { controller } = setup ( {
180
+ const { service } = setup ( {
183
181
accounts : [
184
182
// Wallet 1:
185
183
MockAccountBuilder . from ( MOCK_HD_ACCOUNT_1 )
@@ -193,7 +191,7 @@ describe('MultichainAccountService', () => {
193
191
] ,
194
192
} ) ;
195
193
196
- const multichainAccounts = controller . getMultichainAccounts ( {
194
+ const multichainAccounts = service . getMultichainAccounts ( {
197
195
entropySource : MOCK_HD_KEYRING_1 . metadata . id ,
198
196
} ) ;
199
197
expect ( multichainAccounts ) . toHaveLength ( 2 ) ; // Group index 0 + 1.
@@ -208,7 +206,7 @@ describe('MultichainAccountService', () => {
208
206
} ) ;
209
207
210
208
it ( 'throws if trying to access an unknown wallet' , ( ) => {
211
- const { controller } = setup ( {
209
+ const { service } = setup ( {
212
210
keyrings : [ MOCK_HD_KEYRING_1 ] ,
213
211
accounts : [
214
212
// Wallet 1:
@@ -222,7 +220,7 @@ describe('MultichainAccountService', () => {
222
220
// Wallet 2 should not exist, thus, this should throw.
223
221
expect ( ( ) =>
224
222
// NOTE: We use `getMultichainAccounts` which uses `#getWallet` under the hood.
225
- controller . getMultichainAccounts ( {
223
+ service . getMultichainAccounts ( {
226
224
entropySource : MOCK_HD_KEYRING_2 . metadata . id ,
227
225
} ) ,
228
226
) . toThrow ( 'Unknown wallet, no wallet matching this entropy source' ) ;
@@ -242,12 +240,12 @@ describe('MultichainAccountService', () => {
242
240
. withGroupIndex ( 1 )
243
241
. get ( ) ,
244
242
] ;
245
- const { controller } = setup ( {
243
+ const { service } = setup ( {
246
244
accounts,
247
245
} ) ;
248
246
249
247
const groupIndex = 1 ;
250
- const multichainAccount = controller . getMultichainAccount ( {
248
+ const multichainAccount = service . getMultichainAccount ( {
251
249
entropySource : MOCK_HD_KEYRING_1 . metadata . id ,
252
250
groupIndex,
253
251
} ) ;
@@ -259,7 +257,7 @@ describe('MultichainAccountService', () => {
259
257
} ) ;
260
258
261
259
it ( 'throws if trying to access an out-of-bound group index' , ( ) => {
262
- const { controller } = setup ( {
260
+ const { service } = setup ( {
263
261
accounts : [
264
262
// Wallet 1:
265
263
MockAccountBuilder . from ( MOCK_HD_ACCOUNT_1 )
@@ -271,7 +269,7 @@ describe('MultichainAccountService', () => {
271
269
272
270
const groupIndex = 1 ;
273
271
expect ( ( ) =>
274
- controller . getMultichainAccount ( {
272
+ service . getMultichainAccount ( {
275
273
entropySource : MOCK_HD_KEYRING_1 . metadata . id ,
276
274
groupIndex,
277
275
} ) ,
@@ -289,14 +287,14 @@ describe('MultichainAccountService', () => {
289
287
. withGroupIndex ( 0 )
290
288
. get ( ) ,
291
289
] ;
292
- const { controller , messenger, mocks } = setup ( {
290
+ const { service , messenger, mocks } = setup ( {
293
291
keyrings,
294
292
accounts,
295
293
} ) ;
296
294
297
295
// This wallet does not exist yet.
298
296
expect ( ( ) =>
299
- controller . getMultichainAccounts ( {
297
+ service . getMultichainAccounts ( {
300
298
entropySource : MOCK_HD_KEYRING_2 . metadata . id ,
301
299
} ) ,
302
300
) . toThrow ( 'Unknown wallet, no wallet matching this entropy source' ) ;
@@ -325,7 +323,7 @@ describe('MultichainAccountService', () => {
325
323
326
324
// We should now be able to query that wallet.
327
325
expect (
328
- controller . getMultichainAccounts ( {
326
+ service . getMultichainAccounts ( {
329
327
entropySource : MOCK_HD_KEYRING_2 . metadata . id ,
330
328
} ) ,
331
329
) . toHaveLength ( 1 ) ;
0 commit comments