Skip to content

Commit 7a94067

Browse files
csguicsgui
committed
test: fix param mutability
1 parent 80c1d37 commit 7a94067

File tree

5 files changed

+168
-163
lines changed

5 files changed

+168
-163
lines changed

‎clarity/src/vm/tests/assets.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const FIRST_CLASS_TOKENS: &str = "(define-fungible-token stackaroos)
3333
(define-read-only (my-ft-get-balance (account principal))
3434
(ft-get-balance stackaroos account))
3535
(define-read-only (get-total-supply)
36-
(ft-get-supply stackaroos))
36+
(ft-get-supply stackaroos))
3737
(define-public (my-token-transfer (to principal) (amount uint))
3838
(ft-transfer? stackaroos amount tx-sender to))
3939
(define-public (faucet)
@@ -98,7 +98,7 @@ const ASSET_NAMES: &str =
9898
(unwrap! token-to-contract-result token-to-contract-result)
9999
(unwrap! contract-to-burn-result contract-to-burn-result)
100100
(ok 0))))
101-
(define-public (register
101+
(define-public (register
102102
(recipient-principal principal)
103103
(name int)
104104
(salt int))
@@ -1006,7 +1006,7 @@ fn test_simple_naming_system(
10061006
_ => panic!(),
10071007
};
10081008

1009-
let placeholder_context =
1009+
let mut placeholder_context =
10101010
ContractContext::new(QualifiedContractIdentifier::transient(), version);
10111011

10121012
let tokens_contract_id =
@@ -1107,7 +1107,7 @@ fn test_simple_naming_system(
11071107
assert!(is_committed(&result));
11081108

11091109
{
1110-
let mut env = owned_env.get_exec_environment(None, None, &placeholder_context);
1110+
let mut env = owned_env.get_exec_environment(None, None, &mut placeholder_context);
11111111
assert_eq!(
11121112
env.eval_read_only(&names_contract_id.clone(), "(nft-get-owner? names 1)")
11131113
.unwrap(),
@@ -1378,7 +1378,7 @@ fn test_simple_naming_system(
13781378
assert_eq!(asset_map.to_table().len(), 0);
13791379

13801380
{
1381-
let mut env = owned_env.get_exec_environment(None, None, &placeholder_context);
1381+
let mut env = owned_env.get_exec_environment(None, None, &mut placeholder_context);
13821382
assert_eq!(
13831383
env.eval_read_only(&names_contract_id.clone(), "(nft-get-owner? names 5)")
13841384
.unwrap(),

‎clarity/src/vm/tests/contracts.rs

Lines changed: 54 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const SIMPLE_TOKENS: &str = "(define-map tokens { account: principal } { balance
7575
(token-credit! to amount)))))
7676
(define-public (faucet)
7777
(let ((original-sender tx-sender))
78-
(as-contract (print (token-transfer (print original-sender) u1)))))
78+
(as-contract (print (token-transfer (print original-sender) u1)))))
7979
(define-public (mint-after (block-to-release uint))
8080
(if (>= block-height block-to-release)
8181
(faucet)
@@ -119,7 +119,7 @@ fn test_get_block_info_eval(
119119
Ok(Value::none()),
120120
];
121121

122-
let placeholder_context = ContractContext::new(
122+
let mut placeholder_context = ContractContext::new(
123123
QualifiedContractIdentifier::transient(),
124124
ClarityVersion::Clarity2,
125125
);
@@ -138,7 +138,7 @@ fn test_get_block_info_eval(
138138
)
139139
.unwrap();
140140

141-
let mut env = owned_env.get_exec_environment(None, None, &placeholder_context);
141+
let mut env = owned_env.get_exec_environment(None, None, &mut placeholder_context);
142142
eprintln!("{}", contracts[i]);
143143
let eval_result = env.eval_read_only(&contract_identifier, "(test-func)");
144144
match expected[i] {
@@ -172,13 +172,13 @@ fn test_contract_caller(epoch: StacksEpochId, mut env_factory: MemoryEnvironment
172172
(as-contract (contract-call? .contract-a get-caller)))";
173173

174174
let p1 = execute("'SZ2J6ZY48GV1EZ5V2V5RB9MP66SW86PYKKQ9H6DPR");
175-
let placeholder_context = ContractContext::new(
175+
let mut placeholder_context = ContractContext::new(
176176
QualifiedContractIdentifier::transient(),
177177
ClarityVersion::Clarity2,
178178
);
179179

180180
{
181-
let mut env = owned_env.get_exec_environment(None, None, &placeholder_context);
181+
let mut env = owned_env.get_exec_environment(None, None, &mut placeholder_context);
182182
env.initialize_contract(
183183
QualifiedContractIdentifier::local("contract-a").unwrap(),
184184
contract_a,
@@ -200,7 +200,7 @@ fn test_contract_caller(epoch: StacksEpochId, mut env_factory: MemoryEnvironment
200200
let mut env = owned_env.get_exec_environment(
201201
Some(p1.clone().expect_principal().unwrap()),
202202
None,
203-
&placeholder_context,
203+
&mut placeholder_context,
204204
);
205205
assert_eq!(
206206
env.execute_contract(
@@ -312,7 +312,7 @@ fn test_tx_sponsor(epoch: StacksEpochId, mut env_factory: MemoryEnvironmentGener
312312
.expect_principal()
313313
.unwrap();
314314
let p2 = execute("'SM2J6ZY48GV1EZ5V2V5RB9MP66SW86PYKKQVX8X0G");
315-
let placeholder_context = ContractContext::new(
315+
let mut placeholder_context = ContractContext::new(
316316
QualifiedContractIdentifier::transient(),
317317
ClarityVersion::Clarity2,
318318
);
@@ -324,8 +324,11 @@ fn test_tx_sponsor(epoch: StacksEpochId, mut env_factory: MemoryEnvironmentGener
324324
};
325325

326326
{
327-
let mut env =
328-
owned_env.get_exec_environment(Some(p1.clone()), sponsor.clone(), &placeholder_context);
327+
let mut env = owned_env.get_exec_environment(
328+
Some(p1.clone()),
329+
sponsor.clone(),
330+
&mut placeholder_context,
331+
);
329332
env.initialize_contract(
330333
QualifiedContractIdentifier::local("contract-a").unwrap(),
331334
contract_a,
@@ -342,16 +345,19 @@ fn test_tx_sponsor(epoch: StacksEpochId, mut env_factory: MemoryEnvironmentGener
342345

343346
// Sponsor is equal to some(principal) in this code block.
344347
{
345-
let mut env =
346-
owned_env.get_exec_environment(Some(p1.clone()), sponsor.clone(), &placeholder_context);
348+
let mut env = owned_env.get_exec_environment(
349+
Some(p1.clone()),
350+
sponsor.clone(),
351+
&mut placeholder_context,
352+
);
347353
tx_sponsor_contract_asserts(&mut env, sponsor);
348354
}
349355

350356
// Sponsor is none in this code block.
351357
{
352358
let sponsor = None;
353359
let mut env =
354-
owned_env.get_exec_environment(Some(p1), sponsor.clone(), &placeholder_context);
360+
owned_env.get_exec_environment(Some(p1), sponsor.clone(), &mut placeholder_context);
355361
tx_sponsor_contract_asserts(&mut env, sponsor);
356362
}
357363
}
@@ -375,13 +381,13 @@ fn test_fully_qualified_contract_call(
375381
(as-contract (contract-call? .contract-a get-caller)))";
376382

377383
let p1 = execute("'SZ2J6ZY48GV1EZ5V2V5RB9MP66SW86PYKKQ9H6DPR");
378-
let placeholder_context = ContractContext::new(
384+
let mut placeholder_context = ContractContext::new(
379385
QualifiedContractIdentifier::transient(),
380386
ClarityVersion::Clarity2,
381387
);
382388

383389
{
384-
let mut env = owned_env.get_exec_environment(None, None, &placeholder_context);
390+
let mut env = owned_env.get_exec_environment(None, None, &mut placeholder_context);
385391
env.initialize_contract(
386392
QualifiedContractIdentifier::local("contract-a").unwrap(),
387393
contract_a,
@@ -403,7 +409,7 @@ fn test_fully_qualified_contract_call(
403409
let mut env = owned_env.get_exec_environment(
404410
Some(p1.clone().expect_principal().unwrap()),
405411
None,
406-
&placeholder_context,
412+
&mut placeholder_context,
407413
);
408414
assert_eq!(
409415
env.execute_contract(
@@ -480,7 +486,7 @@ fn test_simple_naming_system(epoch: StacksEpochId, mut env_factory: MemoryEnviro
480486
\"not enough balance\")
481487
(err 1) (err 3)))))
482488
483-
(define-public (register
489+
(define-public (register
484490
(recipient-principal principal)
485491
(name int)
486492
(salt int))
@@ -514,13 +520,13 @@ fn test_simple_naming_system(epoch: StacksEpochId, mut env_factory: MemoryEnviro
514520
let name_hash_expensive_0 = execute("(hash160 1)");
515521
let name_hash_expensive_1 = execute("(hash160 2)");
516522
let name_hash_cheap_0 = execute("(hash160 100001)");
517-
let placeholder_context = ContractContext::new(
523+
let mut placeholder_context = ContractContext::new(
518524
QualifiedContractIdentifier::transient(),
519525
ClarityVersion::Clarity2,
520526
);
521527

522528
{
523-
let mut env = owned_env.get_exec_environment(None, None, &placeholder_context);
529+
let mut env = owned_env.get_exec_environment(None, None, &mut placeholder_context);
524530

525531
let contract_identifier = QualifiedContractIdentifier::local("tokens").unwrap();
526532
env.initialize_contract(contract_identifier, tokens_contract, ASTRules::PrecheckSize)
@@ -535,7 +541,7 @@ fn test_simple_naming_system(epoch: StacksEpochId, mut env_factory: MemoryEnviro
535541
let mut env = owned_env.get_exec_environment(
536542
Some(p2.clone().expect_principal().unwrap()),
537543
None,
538-
&placeholder_context,
544+
&mut placeholder_context,
539545
);
540546

541547
assert!(is_err_code(
@@ -554,7 +560,7 @@ fn test_simple_naming_system(epoch: StacksEpochId, mut env_factory: MemoryEnviro
554560
let mut env = owned_env.get_exec_environment(
555561
Some(p1.clone().expect_principal().unwrap()),
556562
None,
557-
&placeholder_context,
563+
&mut placeholder_context,
558564
);
559565
assert!(is_committed(
560566
&env.execute_contract(
@@ -582,7 +588,7 @@ fn test_simple_naming_system(epoch: StacksEpochId, mut env_factory: MemoryEnviro
582588
let mut env = owned_env.get_exec_environment(
583589
Some(p2.clone().expect_principal().unwrap()),
584590
None,
585-
&placeholder_context,
591+
&mut placeholder_context,
586592
);
587593
assert!(is_err_code(
588594
&env.execute_contract(
@@ -601,7 +607,7 @@ fn test_simple_naming_system(epoch: StacksEpochId, mut env_factory: MemoryEnviro
601607
let mut env = owned_env.get_exec_environment(
602608
Some(p1.expect_principal().unwrap()),
603609
None,
604-
&placeholder_context,
610+
&mut placeholder_context,
605611
);
606612
assert!(is_committed(
607613
&env.execute_contract(
@@ -619,7 +625,7 @@ fn test_simple_naming_system(epoch: StacksEpochId, mut env_factory: MemoryEnviro
619625
let mut env = owned_env.get_exec_environment(
620626
Some(p2.clone().expect_principal().unwrap()),
621627
None,
622-
&placeholder_context,
628+
&mut placeholder_context,
623629
);
624630
assert!(is_committed(
625631
&env.execute_contract(
@@ -684,15 +690,15 @@ fn test_simple_contract_call(epoch: StacksEpochId, mut env_factory: MemoryEnviro
684690
(contract-call? .factorial-contract compute 8008))
685691
";
686692

687-
let placeholder_context = ContractContext::new(
693+
let mut placeholder_context = ContractContext::new(
688694
QualifiedContractIdentifier::transient(),
689695
ClarityVersion::Clarity2,
690696
);
691697

692698
let mut env = owned_env.get_exec_environment(
693699
Some(get_principal().expect_principal().unwrap()),
694700
None,
695-
&placeholder_context,
701+
&mut placeholder_context,
696702
);
697703

698704
let contract_identifier = QualifiedContractIdentifier::local("factorial-contract").unwrap();
@@ -752,10 +758,9 @@ fn test_aborts(epoch: StacksEpochId, mut env_factory: MemoryEnvironmentGenerator
752758
(ok 1)
753759
(err 1))))
754760
755-
756761
(define-private (get-data (id int))
757762
(default-to 0
758-
(get value
763+
(get value
759764
(map-get? data (tuple (id id))))))
760765
";
761766

@@ -770,12 +775,12 @@ fn test_aborts(epoch: StacksEpochId, mut env_factory: MemoryEnvironmentGenerator
770775
(contract-call? .contract-1 modify-data 105 105)
771776
(err 1)))
772777
";
773-
let placeholder_context = ContractContext::new(
778+
let mut placeholder_context = ContractContext::new(
774779
QualifiedContractIdentifier::transient(),
775780
ClarityVersion::Clarity2,
776781
);
777782

778-
let mut env = owned_env.get_exec_environment(None, None, &placeholder_context);
783+
let mut env = owned_env.get_exec_environment(None, None, &mut placeholder_context);
779784

780785
let contract_identifier = QualifiedContractIdentifier::local("contract-1").unwrap();
781786
env.initialize_contract(contract_identifier, contract_1, ASTRules::PrecheckSize)
@@ -884,12 +889,12 @@ fn test_aborts(epoch: StacksEpochId, mut env_factory: MemoryEnvironmentGenerator
884889
fn test_factorial_contract(epoch: StacksEpochId, mut env_factory: MemoryEnvironmentGenerator) {
885890
let mut owned_env = env_factory.get_env(epoch);
886891

887-
let placeholder_context = ContractContext::new(
892+
let mut placeholder_context = ContractContext::new(
888893
QualifiedContractIdentifier::transient(),
889894
ClarityVersion::Clarity2,
890895
);
891896

892-
let mut env = owned_env.get_exec_environment(None, None, &placeholder_context);
897+
let mut env = owned_env.get_exec_environment(None, None, &mut placeholder_context);
893898

894899
let contract_identifier = QualifiedContractIdentifier::local("factorial").unwrap();
895900
env.initialize_contract(
@@ -1012,7 +1017,7 @@ fn test_at_unknown_block(
10121017
fn test_as_max_len(epoch: StacksEpochId, mut tl_env_factory: TopLevelMemoryEnvironmentGenerator) {
10131018
let mut owned_env = tl_env_factory.get_env(epoch);
10141019
let contract = "(define-data-var token-ids (list 10 uint) (list))
1015-
(var-set token-ids
1020+
(var-set token-ids
10161021
(unwrap! (as-max-len? (append (var-get token-ids) u1) u10) (err 10)))";
10171022

10181023
owned_env
@@ -1027,11 +1032,11 @@ fn test_as_max_len(epoch: StacksEpochId, mut tl_env_factory: TopLevelMemoryEnvir
10271032

10281033
#[test]
10291034
fn test_ast_stack_depth() {
1030-
let program = "(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1031-
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1032-
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1033-
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1034-
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1035+
let program = "(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1036+
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1037+
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1038+
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1039+
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
10351040
1 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1)
10361041
1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1)
10371042
1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1)
@@ -1072,23 +1077,23 @@ fn test_cc_stack_depth(
10721077
mut env_factory: MemoryEnvironmentGenerator,
10731078
) {
10741079
let mut owned_env = env_factory.get_env(epoch);
1075-
let contract_one = "(define-public (foo)
1076-
(ok (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1077-
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1080+
let contract_one = "(define-public (foo)
1081+
(ok (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1082+
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
10781083
1 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1)
10791084
1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1)))";
10801085
let contract_two =
1081-
"(define-private (bar)
1082-
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1083-
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1086+
"(define-private (bar)
1087+
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
1088+
(+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+ (+
10841089
(unwrap-panic (contract-call? .c-foo foo ) )
10851090
1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1)
10861091
1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1) 1))
10871092
(bar)
10881093
";
1089-
let placeholder_context =
1094+
let mut placeholder_context =
10901095
ContractContext::new(QualifiedContractIdentifier::transient(), version);
1091-
let mut env = owned_env.get_exec_environment(None, None, &placeholder_context);
1096+
let mut env = owned_env.get_exec_environment(None, None, &mut placeholder_context);
10921097

10931098
let contract_identifier = QualifiedContractIdentifier::local("c-foo").unwrap();
10941099
env.initialize_contract(contract_identifier, contract_one, ASTRules::PrecheckSize)
@@ -1127,9 +1132,9 @@ fn test_cc_trait_stack_depth(
11271132
(bar .c-foo)
11281133
";
11291134

1130-
let placeholder_context =
1135+
let mut placeholder_context =
11311136
ContractContext::new(QualifiedContractIdentifier::transient(), version);
1132-
let mut env = owned_env.get_exec_environment(None, None, &placeholder_context);
1137+
let mut env = owned_env.get_exec_environment(None, None, &mut placeholder_context);
11331138

11341139
let contract_identifier = QualifiedContractIdentifier::local("c-foo").unwrap();
11351140
env.initialize_contract(contract_identifier, contract_one, ASTRules::PrecheckSize)
@@ -1150,15 +1155,15 @@ fn test_eval_with_non_existing_contract(
11501155
) {
11511156
let mut owned_env = env_factory.get_env(epoch);
11521157

1153-
let placeholder_context = ContractContext::new(
1158+
let mut placeholder_context = ContractContext::new(
11541159
QualifiedContractIdentifier::transient(),
11551160
ClarityVersion::Clarity2,
11561161
);
11571162

11581163
let mut env = owned_env.get_exec_environment(
11591164
Some(get_principal().expect_principal().unwrap()),
11601165
None,
1161-
&placeholder_context,
1166+
&mut placeholder_context,
11621167
);
11631168

11641169
let result = env.eval_read_only(

0 commit comments

Comments
 (0)