Skip to content

Commit f42215a

Browse files
febofebo
authored
program: Update mollusk dependency (#83)
Update mollusk dependency
1 parent c835591 commit f42215a

12 files changed

Lines changed: 1252 additions & 530 deletions

File tree

‎Cargo.lock‎

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

‎program/Cargo.toml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ solana-program-log = { version = "1.0", default-features = false }
2727
solana-security-txt = "1.1.3"
2828

2929
[dev-dependencies]
30-
mollusk-svm = { version = "0.4" }
31-
solana-account = "2.2.1"
32-
solana-instruction = "2.2.1"
33-
solana-program-error = "2.2.1"
34-
solana-pubkey = "2.2.1"
35-
solana-rent = "2.2.1"
36-
solana-sdk-ids = "2.2.1"
30+
mollusk-svm = "0.13"
31+
solana-account = "3.4"
32+
solana-instruction = "3.2"
33+
solana-logger = "3.0"
34+
solana-program-error = "3.0"
35+
solana-pubkey = "4.1"
36+
solana-rent = "3.1"
37+
solana-sdk-ids = "3.1"
3738

3839
[features]
3940
logging = []

‎program/tests/allocate.rs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ fn test_allocate_keypair() {
122122
),
123123
&[
124124
(buffer_key, buffer_account),
125-
(PROGRAM_ID, Account::default()),
126125
keyed_account_for_system_program(),
127126
],
128127
);
@@ -148,7 +147,6 @@ fn test_allocate_with_empty_account() {
148147
),
149148
&[
150149
(buffer_key, buffer_account),
151-
(PROGRAM_ID, Account::default()),
152150
keyed_account_for_system_program(),
153151
],
154152
);
@@ -168,7 +166,6 @@ fn test_allocate_with_unsufficient_length() {
168166
),
169167
&[
170168
(buffer_key, buffer_account),
171-
(PROGRAM_ID, Account::default()),
172169
keyed_account_for_system_program(),
173170
],
174171
);
@@ -287,7 +284,6 @@ fn test_allocate_with_funded_keypair_account() {
287284
),
288285
&[
289286
(buffer_key, buffer_account),
290-
(PROGRAM_ID, Account::default()),
291287
keyed_account_for_system_program(),
292288
],
293289
);
@@ -313,7 +309,6 @@ fn test_allocate_with_allocated_keypair_account() {
313309
),
314310
&[
315311
(buffer_key, buffer_account),
316-
(PROGRAM_ID, Account::default()),
317312
keyed_account_for_system_program(),
318313
],
319314
);
@@ -412,7 +407,6 @@ fn test_allocate_with_unfunded_account() {
412407
),
413408
&[
414409
(buffer_key, buffer_account),
415-
(PROGRAM_ID, Account::default()),
416410
keyed_account_for_system_program(),
417411
],
418412
);
@@ -434,7 +428,6 @@ fn fail_allocate_keypair_with_seed() {
434428
),
435429
&[
436430
(buffer_key, buffer_account),
437-
(PROGRAM_ID, Account::default()),
438431
keyed_account_for_system_program(),
439432
],
440433
);
@@ -541,7 +534,6 @@ fn fail_allocate_already_initialized_buffer() {
541534
],
542535
&[
543536
(buffer_key, buffer_account),
544-
(PROGRAM_ID, Account::default()),
545537
keyed_account_for_system_program(),
546538
],
547539
);

‎program/tests/close.rs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ fn test_close_metadata() {
7777
],
7878
&[
7979
(metadata_key, metadata_account),
80-
(PROGRAM_ID, Account::default()),
8180
(authority_key, Account::default()),
8281
(program_key, program_account),
8382
(program_data_key, program_data_account),
@@ -120,7 +119,6 @@ fn test_close_buffer() {
120119
],
121120
&[
122121
(buffer_key, buffer_account),
123-
(PROGRAM_ID, Account::default()),
124122
(destination_key, Account::default()),
125123
keyed_account_for_system_program(),
126124
],
@@ -155,7 +153,6 @@ fn fail_close_with_wrong_authority() {
155153
],
156154
&[
157155
(buffer_key, buffer_account),
158-
(PROGRAM_ID, Account::default()),
159156
(wrong_authority_key, Account::default()),
160157
(destination_key, Account::default()),
161158
keyed_account_for_system_program(),
@@ -175,7 +172,6 @@ fn fail_close_uninitialized_account() {
175172
),
176173
&[
177174
(account_key, Account::default()),
178-
(PROGRAM_ID, Account::default()),
179175
(destination_key, Account::default()),
180176
],
181177
);
@@ -194,7 +190,6 @@ fn fail_close_account_with_empty_discriminator() {
194190
),
195191
&[
196192
(account_key, account),
197-
(PROGRAM_ID, Account::default()),
198193
(destination_key, Account::default()),
199194
],
200195
);
@@ -265,7 +260,6 @@ fn fail_close_immutable_metadata() {
265260
],
266261
&[
267262
(metadata_key, metadata_account),
268-
(PROGRAM_ID, Account::default()),
269263
(authority_key, Account::default()),
270264
(program_key, program_account),
271265
(program_data_key, program_data_account),

‎program/tests/extend.rs‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ fn test_extend_keypair_buffer() {
188188
],
189189
&[
190190
(buffer_key, buffer_account),
191-
(PROGRAM_ID, Account::default()),
192191
keyed_account_for_system_program(),
193192
],
194193
);
@@ -255,7 +254,6 @@ fn test_extend_metadata() {
255254
],
256255
&[
257256
(metadata_key, metadata_account),
258-
(PROGRAM_ID, Account::default()),
259257
(authority_key, Account::default()),
260258
(program_key, program_account),
261259
(program_data_key, program_data_account),
@@ -292,7 +290,6 @@ fn fail_extend_with_wrong_authority() {
292290
],
293291
&[
294292
(buffer_key, buffer_account),
295-
(PROGRAM_ID, Account::default()),
296293
(wrong_authority_key, Account::default()),
297294
keyed_account_for_system_program(),
298295
],
@@ -308,10 +305,7 @@ fn fail_extend_uninitialized_account() {
308305
&extend(&account_key, &account_key, None, None, EXTEND_LENGTH as u16),
309306
&[Check::err(ProgramError::InvalidAccountData)],
310307
),
311-
&[
312-
(account_key, Account::default()),
313-
(PROGRAM_ID, Account::default()),
314-
],
308+
&[(account_key, Account::default())],
315309
);
316310
}
317311

@@ -326,9 +320,6 @@ fn fail_extend_with_invalid_instruction_data() {
326320
&instruction,
327321
&[Check::err(ProgramError::InvalidInstructionData)],
328322
),
329-
&[
330-
(buffer_key, Account::default()),
331-
(PROGRAM_ID, Account::default()),
332-
],
323+
&[(buffer_key, Account::default())],
333324
);
334325
}

‎program/tests/initialize.rs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ fn test_initialize_canonical() {
5959
),
6060
&[
6161
(metadata_key, metadata_account),
62-
(PROGRAM_ID, Account::default()),
6362
(authority_key, Account::default()),
6463
(program_key, program_account),
6564
(program_data_key, program_data_account),
@@ -118,7 +117,6 @@ fn test_initialize_non_canonical() {
118117
),
119118
&[
120119
(metadata_key, metadata_account),
121-
(PROGRAM_ID, Account::default()),
122120
(authority_key, Account::default()),
123121
(program_key, program_account),
124122
(program_data_key, program_data_account),
@@ -198,7 +196,6 @@ fn test_initialize_from_buffer() {
198196
],
199197
&[
200198
(metadata_key, metadata_account),
201-
(PROGRAM_ID, Account::default()),
202199
(authority_key, Account::default()),
203200
(program_key, program_account),
204201
(program_data_key, program_data_account),
@@ -255,7 +252,6 @@ fn fail_initialize_already_initialized_metadata() {
255252
],
256253
&[
257254
(metadata_key, metadata_account),
258-
(PROGRAM_ID, Account::default()),
259255
(authority_key, Account::default()),
260256
(program_key, program_account),
261257
(program_data_key, program_data_account),
@@ -322,7 +318,6 @@ fn fail_initialize_from_buffer_with_instruction_data() {
322318
],
323319
&[
324320
(metadata_key, buffer_account),
325-
(PROGRAM_ID, Account::default()),
326321
(authority_key, Account::default()),
327322
(program_key, program_account),
328323
(program_data_key, program_data_account),
@@ -368,7 +363,6 @@ fn fail_initialize_with_wrong_metadata_pda() {
368363
(&instruction, &[Check::err(ProgramError::InvalidSeeds)]),
369364
&[
370365
(wrong_metadata_key, metadata_account),
371-
(PROGRAM_ID, Account::default()),
372366
(authority_key, Account::default()),
373367
(program_key, program_account),
374368
(program_data_key, program_data_account),
@@ -414,7 +408,6 @@ fn fail_initialize_unfunded_metadata() {
414408
),
415409
&[
416410
(metadata_key, metadata_account),
417-
(PROGRAM_ID, Account::default()),
418411
(authority_key, Account::default()),
419412
(program_key, program_account),
420413
(program_data_key, program_data_account),
@@ -461,7 +454,6 @@ fn fail_initialize_without_data() {
461454
),
462455
&[
463456
(metadata_key, metadata_account),
464-
(PROGRAM_ID, Account::default()),
465457
(authority_key, Account::default()),
466458
(program_key, program_account),
467459
(program_data_key, program_data_account),
@@ -508,7 +500,6 @@ fn fail_initialize_with_invalid_encoding() {
508500
),
509501
&[
510502
(metadata_key, metadata_account),
511-
(PROGRAM_ID, Account::default()),
512503
(authority_key, Account::default()),
513504
(program_key, program_account),
514505
(program_data_key, program_data_account),
@@ -557,7 +548,6 @@ fn fail_initialize_external_data_with_wrong_length() {
557548
),
558549
&[
559550
(metadata_key, metadata_account),
560-
(PROGRAM_ID, Account::default()),
561551
(authority_key, Account::default()),
562552
(program_key, program_account),
563553
(program_data_key, program_data_account),

‎program/tests/set_authority.rs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ fn test_set_authority_metadata() {
9090
],
9191
&[
9292
(metadata_key, metadata_account),
93-
(PROGRAM_ID, Account::default()),
9493
(authority_key, Account::default()),
9594
(new_authority_key, Account::default()),
9695
(program_key, program_account),
@@ -185,7 +184,6 @@ fn test_remove_metadata_authority() {
185184
],
186185
&[
187186
(metadata_key, metadata_account),
188-
(PROGRAM_ID, Account::default()),
189187
(authority_key, Account::default()),
190188
(new_authority_key, Account::default()),
191189
(program_key, program_account),
@@ -239,7 +237,6 @@ fn test_set_authority_buffer() {
239237
],
240238
&[
241239
(buffer_key, buffer_account),
242-
(PROGRAM_ID, Account::default()),
243240
(new_authority_key, Account::default()),
244241
keyed_account_for_system_program(),
245242
],
@@ -308,7 +305,6 @@ fn fail_set_authority_immutable_metadata() {
308305
],
309306
&[
310307
(metadata_key, metadata_account),
311-
(PROGRAM_ID, Account::default()),
312308
(authority_key, Account::default()),
313309
(program_key, program_account),
314310
(program_data_key, program_data_account),
@@ -370,7 +366,6 @@ fn test_set_authority_non_canonical_metadata() {
370366
],
371367
&[
372368
(metadata_key, metadata_account),
373-
(PROGRAM_ID, Account::default()),
374369
(authority_key, Account::default()),
375370
(program_key, program_account),
376371
(program_data_key, program_data_account),
@@ -431,7 +426,6 @@ fn fail_set_authority_with_wrong_authority() {
431426
],
432427
&[
433428
(metadata_key, metadata_account),
434-
(PROGRAM_ID, Account::default()),
435429
(authority_key, Account::default()),
436430
(wrong_authority_key, Account::default()),
437431
(program_key, program_account),
@@ -460,7 +454,6 @@ fn fail_set_authority_remove_buffer_authority() {
460454
],
461455
&[
462456
(buffer_key, buffer_account),
463-
(PROGRAM_ID, Account::default()),
464457
keyed_account_for_system_program(),
465458
],
466459
);
@@ -495,7 +488,6 @@ fn fail_set_authority_with_missing_new_authority_bytes() {
495488
],
496489
&[
497490
(buffer_key, buffer_account),
498-
(PROGRAM_ID, Account::default()),
499491
keyed_account_for_system_program(),
500492
],
501493
);

0 commit comments

Comments
 (0)