Skip to content

Commit 1144c66

Browse files
committed
feat: Replace jet_verify with assert!
Simfony programs look more like Rust if we write assert! instead of jet_verify. It looks like Rust's assert! macro returns the unit type, just like Simfony's jet_verify, so the two should be type-compatible. Remove jet_verify from the list of jets to prevent confusion.
1 parent edd4d7d commit 1144c66

20 files changed

+79
-48
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ let a: u32 = 10;
99
let b = {
1010
let c: u32 = 2;
1111
let d: u32 = 3;
12-
jet_verify(jet_eq_32(a, 10)); // Use variables from outer copes
12+
assert!(jet_eq_32(a, 10)); // Use variables from outer copes
1313
let a: u32 = 7; // Shadow variables from outer scopes
1414
jet_max_32(jet_max_32(c, d), a) // Missing ; because the block returns a value
1515
};
16-
jet_verify(jet_eq_32(b, 7));
16+
assert!(jet_eq_32(b, 7));
1717
```
1818

1919
Take a look at the [example programs](https://github.com/BlockstreamResearch/simfony/tree/master/example_progs).

codegen/src/jet.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -831,8 +831,8 @@ impl Category {
831831

832832
// Core
833833
#[rustfmt::skip]
834-
const MULTI_BIT_LOGIC: [Elements; 213] = [
835-
Elements::All8, Elements::All16, Elements::All32, Elements::All64, Elements::And1, Elements::And8, Elements::And16, Elements::And32, Elements::And64, Elements::Ch1, Elements::Ch8, Elements::Ch16, Elements::Ch32, Elements::Ch64, Elements::Complement1, Elements::Complement8, Elements::Complement16, Elements::Complement32, Elements::Complement64, Elements::Eq1, Elements::Eq8, Elements::Eq16, Elements::Eq32, Elements::Eq64, Elements::Eq256, Elements::FullLeftShift16_1, Elements::FullLeftShift16_2, Elements::FullLeftShift16_4, Elements::FullLeftShift16_8, Elements::FullLeftShift32_1, Elements::FullLeftShift32_2, Elements::FullLeftShift32_4, Elements::FullLeftShift32_8, Elements::FullLeftShift32_16, Elements::FullLeftShift64_1, Elements::FullLeftShift64_2, Elements::FullLeftShift64_4, Elements::FullLeftShift64_8, Elements::FullLeftShift64_16, Elements::FullLeftShift64_32, Elements::FullLeftShift8_1, Elements::FullLeftShift8_2, Elements::FullLeftShift8_4, Elements::FullRightShift16_1, Elements::FullRightShift16_2, Elements::FullRightShift16_4, Elements::FullRightShift16_8, Elements::FullRightShift32_1, Elements::FullRightShift32_2, Elements::FullRightShift32_4, Elements::FullRightShift32_8, Elements::FullRightShift32_16, Elements::FullRightShift64_1, Elements::FullRightShift64_2, Elements::FullRightShift64_4, Elements::FullRightShift64_8, Elements::FullRightShift64_16, Elements::FullRightShift64_32, Elements::FullRightShift8_1, Elements::FullRightShift8_2, Elements::FullRightShift8_4, Elements::High1, Elements::High8, Elements::High16, Elements::High32, Elements::High64, Elements::LeftExtend16_32, Elements::LeftExtend16_64, Elements::LeftExtend1_8, Elements::LeftExtend1_16, Elements::LeftExtend1_32, Elements::LeftExtend1_64, Elements::LeftExtend32_64, Elements::LeftExtend8_16, Elements::LeftExtend8_32, Elements::LeftExtend8_64, Elements::LeftPadHigh16_32, Elements::LeftPadHigh16_64, Elements::LeftPadHigh1_8, Elements::LeftPadHigh1_16, Elements::LeftPadHigh1_32, Elements::LeftPadHigh1_64, Elements::LeftPadHigh32_64, Elements::LeftPadHigh8_16, Elements::LeftPadHigh8_32, Elements::LeftPadHigh8_64, Elements::LeftPadLow16_32, Elements::LeftPadLow16_64, Elements::LeftPadLow1_8, Elements::LeftPadLow1_16, Elements::LeftPadLow1_32, Elements::LeftPadLow1_64, Elements::LeftPadLow32_64, Elements::LeftPadLow8_16, Elements::LeftPadLow8_32, Elements::LeftPadLow8_64, Elements::LeftRotate8, Elements::LeftRotate16, Elements::LeftRotate32, Elements::LeftRotate64, Elements::LeftShift8, Elements::LeftShift16, Elements::LeftShift32, Elements::LeftShift64, Elements::LeftShiftWith8, Elements::LeftShiftWith16, Elements::LeftShiftWith32, Elements::LeftShiftWith64, Elements::Leftmost16_1, Elements::Leftmost16_2, Elements::Leftmost16_4, Elements::Leftmost16_8, Elements::Leftmost32_1, Elements::Leftmost32_2, Elements::Leftmost32_4, Elements::Leftmost32_8, Elements::Leftmost32_16, Elements::Leftmost64_1, Elements::Leftmost64_2, Elements::Leftmost64_4, Elements::Leftmost64_8, Elements::Leftmost64_16, Elements::Leftmost64_32, Elements::Leftmost8_1, Elements::Leftmost8_2, Elements::Leftmost8_4, Elements::Low1, Elements::Low8, Elements::Low16, Elements::Low32, Elements::Low64, Elements::Maj1, Elements::Maj8, Elements::Maj16, Elements::Maj32, Elements::Maj64, Elements::Or1, Elements::Or8, Elements::Or16, Elements::Or32, Elements::Or64, Elements::RightExtend16_32, Elements::RightExtend16_64, Elements::RightExtend32_64, Elements::RightExtend8_16, Elements::RightExtend8_32, Elements::RightExtend8_64, Elements::RightPadHigh16_32, Elements::RightPadHigh16_64, Elements::RightPadHigh1_8, Elements::RightPadHigh1_16, Elements::RightPadHigh1_32, Elements::RightPadHigh1_64, Elements::RightPadHigh32_64, Elements::RightPadHigh8_16, Elements::RightPadHigh8_32, Elements::RightPadHigh8_64, Elements::RightPadLow16_32, Elements::RightPadLow16_64, Elements::RightPadLow1_8, Elements::RightPadLow1_16, Elements::RightPadLow1_32, Elements::RightPadLow1_64, Elements::RightPadLow32_64, Elements::RightPadLow8_16, Elements::RightPadLow8_32, Elements::RightPadLow8_64, Elements::RightRotate8, Elements::RightRotate16, Elements::RightRotate32, Elements::RightRotate64, Elements::RightShift8, Elements::RightShift16, Elements::RightShift32, Elements::RightShift64, Elements::RightShiftWith8, Elements::RightShiftWith16, Elements::RightShiftWith32, Elements::RightShiftWith64, Elements::Rightmost16_1, Elements::Rightmost16_2, Elements::Rightmost16_4, Elements::Rightmost16_8, Elements::Rightmost32_1, Elements::Rightmost32_2, Elements::Rightmost32_4, Elements::Rightmost32_8, Elements::Rightmost32_16, Elements::Rightmost64_1, Elements::Rightmost64_2, Elements::Rightmost64_4, Elements::Rightmost64_8, Elements::Rightmost64_16, Elements::Rightmost64_32, Elements::Rightmost8_1, Elements::Rightmost8_2, Elements::Rightmost8_4, Elements::Some1, Elements::Some8, Elements::Some16, Elements::Some32, Elements::Some64, Elements::Verify, Elements::Xor1, Elements::Xor8, Elements::Xor16, Elements::Xor32, Elements::Xor64, Elements::XorXor1, Elements::XorXor8, Elements::XorXor16, Elements::XorXor32, Elements::XorXor64
834+
const MULTI_BIT_LOGIC: [Elements; 212] = [
835+
Elements::All8, Elements::All16, Elements::All32, Elements::All64, Elements::And1, Elements::And8, Elements::And16, Elements::And32, Elements::And64, Elements::Ch1, Elements::Ch8, Elements::Ch16, Elements::Ch32, Elements::Ch64, Elements::Complement1, Elements::Complement8, Elements::Complement16, Elements::Complement32, Elements::Complement64, Elements::Eq1, Elements::Eq8, Elements::Eq16, Elements::Eq32, Elements::Eq64, Elements::Eq256, Elements::FullLeftShift16_1, Elements::FullLeftShift16_2, Elements::FullLeftShift16_4, Elements::FullLeftShift16_8, Elements::FullLeftShift32_1, Elements::FullLeftShift32_2, Elements::FullLeftShift32_4, Elements::FullLeftShift32_8, Elements::FullLeftShift32_16, Elements::FullLeftShift64_1, Elements::FullLeftShift64_2, Elements::FullLeftShift64_4, Elements::FullLeftShift64_8, Elements::FullLeftShift64_16, Elements::FullLeftShift64_32, Elements::FullLeftShift8_1, Elements::FullLeftShift8_2, Elements::FullLeftShift8_4, Elements::FullRightShift16_1, Elements::FullRightShift16_2, Elements::FullRightShift16_4, Elements::FullRightShift16_8, Elements::FullRightShift32_1, Elements::FullRightShift32_2, Elements::FullRightShift32_4, Elements::FullRightShift32_8, Elements::FullRightShift32_16, Elements::FullRightShift64_1, Elements::FullRightShift64_2, Elements::FullRightShift64_4, Elements::FullRightShift64_8, Elements::FullRightShift64_16, Elements::FullRightShift64_32, Elements::FullRightShift8_1, Elements::FullRightShift8_2, Elements::FullRightShift8_4, Elements::High1, Elements::High8, Elements::High16, Elements::High32, Elements::High64, Elements::LeftExtend16_32, Elements::LeftExtend16_64, Elements::LeftExtend1_8, Elements::LeftExtend1_16, Elements::LeftExtend1_32, Elements::LeftExtend1_64, Elements::LeftExtend32_64, Elements::LeftExtend8_16, Elements::LeftExtend8_32, Elements::LeftExtend8_64, Elements::LeftPadHigh16_32, Elements::LeftPadHigh16_64, Elements::LeftPadHigh1_8, Elements::LeftPadHigh1_16, Elements::LeftPadHigh1_32, Elements::LeftPadHigh1_64, Elements::LeftPadHigh32_64, Elements::LeftPadHigh8_16, Elements::LeftPadHigh8_32, Elements::LeftPadHigh8_64, Elements::LeftPadLow16_32, Elements::LeftPadLow16_64, Elements::LeftPadLow1_8, Elements::LeftPadLow1_16, Elements::LeftPadLow1_32, Elements::LeftPadLow1_64, Elements::LeftPadLow32_64, Elements::LeftPadLow8_16, Elements::LeftPadLow8_32, Elements::LeftPadLow8_64, Elements::LeftRotate8, Elements::LeftRotate16, Elements::LeftRotate32, Elements::LeftRotate64, Elements::LeftShift8, Elements::LeftShift16, Elements::LeftShift32, Elements::LeftShift64, Elements::LeftShiftWith8, Elements::LeftShiftWith16, Elements::LeftShiftWith32, Elements::LeftShiftWith64, Elements::Leftmost16_1, Elements::Leftmost16_2, Elements::Leftmost16_4, Elements::Leftmost16_8, Elements::Leftmost32_1, Elements::Leftmost32_2, Elements::Leftmost32_4, Elements::Leftmost32_8, Elements::Leftmost32_16, Elements::Leftmost64_1, Elements::Leftmost64_2, Elements::Leftmost64_4, Elements::Leftmost64_8, Elements::Leftmost64_16, Elements::Leftmost64_32, Elements::Leftmost8_1, Elements::Leftmost8_2, Elements::Leftmost8_4, Elements::Low1, Elements::Low8, Elements::Low16, Elements::Low32, Elements::Low64, Elements::Maj1, Elements::Maj8, Elements::Maj16, Elements::Maj32, Elements::Maj64, Elements::Or1, Elements::Or8, Elements::Or16, Elements::Or32, Elements::Or64, Elements::RightExtend16_32, Elements::RightExtend16_64, Elements::RightExtend32_64, Elements::RightExtend8_16, Elements::RightExtend8_32, Elements::RightExtend8_64, Elements::RightPadHigh16_32, Elements::RightPadHigh16_64, Elements::RightPadHigh1_8, Elements::RightPadHigh1_16, Elements::RightPadHigh1_32, Elements::RightPadHigh1_64, Elements::RightPadHigh32_64, Elements::RightPadHigh8_16, Elements::RightPadHigh8_32, Elements::RightPadHigh8_64, Elements::RightPadLow16_32, Elements::RightPadLow16_64, Elements::RightPadLow1_8, Elements::RightPadLow1_16, Elements::RightPadLow1_32, Elements::RightPadLow1_64, Elements::RightPadLow32_64, Elements::RightPadLow8_16, Elements::RightPadLow8_32, Elements::RightPadLow8_64, Elements::RightRotate8, Elements::RightRotate16, Elements::RightRotate32, Elements::RightRotate64, Elements::RightShift8, Elements::RightShift16, Elements::RightShift32, Elements::RightShift64, Elements::RightShiftWith8, Elements::RightShiftWith16, Elements::RightShiftWith32, Elements::RightShiftWith64, Elements::Rightmost16_1, Elements::Rightmost16_2, Elements::Rightmost16_4, Elements::Rightmost16_8, Elements::Rightmost32_1, Elements::Rightmost32_2, Elements::Rightmost32_4, Elements::Rightmost32_8, Elements::Rightmost32_16, Elements::Rightmost64_1, Elements::Rightmost64_2, Elements::Rightmost64_4, Elements::Rightmost64_8, Elements::Rightmost64_16, Elements::Rightmost64_32, Elements::Rightmost8_1, Elements::Rightmost8_2, Elements::Rightmost8_4, Elements::Some1, Elements::Some8, Elements::Some16, Elements::Some32, Elements::Some64, Elements::Xor1, Elements::Xor8, Elements::Xor16, Elements::Xor32, Elements::Xor64, Elements::XorXor1, Elements::XorXor8, Elements::XorXor16, Elements::XorXor32, Elements::XorXor64
836836
];
837837
#[rustfmt::skip]
838838
const ARITHMETIC: [Elements; 92] = [
@@ -872,8 +872,8 @@ const TRANSACTION: [Elements; 49] = [
872872
Elements::CurrentAmount, Elements::CurrentAnnexHash, Elements::CurrentAsset, Elements::CurrentIndex, Elements::CurrentIssuanceAssetAmount, Elements::CurrentIssuanceAssetProof, Elements::CurrentIssuanceTokenAmount, Elements::CurrentIssuanceTokenProof, Elements::CurrentNewIssuanceContract, Elements::CurrentPegin, Elements::CurrentPrevOutpoint, Elements::CurrentReissuanceBlinding, Elements::CurrentReissuanceEntropy, Elements::CurrentScriptHash, Elements::CurrentScriptSigHash, Elements::CurrentSequence, Elements::GenesisBlockHash, Elements::InputAmount, Elements::InputAnnexHash, Elements::InputAsset, Elements::InputPegin, Elements::InputPrevOutpoint, Elements::InputScriptHash, Elements::InputScriptSigHash, Elements::InputSequence, Elements::InternalKey, Elements::IssuanceAssetAmount, Elements::IssuanceAssetProof, Elements::IssuanceTokenAmount, Elements::IssuanceTokenProof, Elements::LockTime, Elements::NewIssuanceContract, Elements::NumInputs, Elements::NumOutputs, Elements::OutputAmount, Elements::OutputAsset, Elements::OutputIsFee, Elements::OutputNonce, Elements::OutputNullDatum, Elements::OutputRangeProof, Elements::OutputScriptHash, Elements::OutputSurjectionProof, Elements::ReissuanceBlinding, Elements::ReissuanceEntropy, Elements::ScriptCMR, Elements::TapleafVersion, Elements::Tappath, Elements::TotalFee, Elements::Version
873873
];
874874
#[rustfmt::skip]
875-
const DISABLED: [Elements; 1] = [
876-
Elements::CheckSigVerify
875+
const DISABLED: [Elements; 2] = [
876+
Elements::CheckSigVerify, Elements::Verify
877877
];
878878

879879
#[cfg(test)]

example_progs/add.simf

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ fn main() {
44
let (carry, res): (bool, u32) = jet_add_32(a, b);
55
let add_res: (bool, u32) = jet_add_32(10, 20);
66
let (carry2, res3): (bool, u32) = add_res;
7-
jet_verify(jet_eq_32(res3, 30));
7+
assert!(jet_eq_32(res3, 30));
88
}

example_progs/array.simf

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn main() {
1212
let []: [u1; 0] = a;
1313

1414
let [d0, d1, d2]: [u8; 3] = d;
15-
jet_verify(jet_eq_8(d0, 1));
16-
jet_verify(jet_eq_8(d1, 2));
17-
jet_verify(jet_eq_8(d2, 3));
15+
assert!(jet_eq_8(d0, 1));
16+
assert!(jet_eq_8(d1, 2));
17+
assert!(jet_eq_8(d2, 3));
1818
}

example_progs/cat.simf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
fn main() {
22
let ab: u16 = <(u8, u8)>::into((0x10, 0x01));
33
let c: u16 = 0x1001;
4-
jet_verify(jet_eq_16(ab, c));
4+
assert!(jet_eq_16(ab, c));
55
let ab: u8 = <(u4, u4)>::into((0b1011, 0b1101));
66
let c: u8 = 0b10111101;
7-
jet_verify(jet_eq_8(ab, c));
7+
assert!(jet_eq_8(ab, c));
88
}

example_progs/ctv.simf

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ fn main() {
1818
let ctv_hash: u256 = jet_sha_256_ctx_8_finalize(ctx);
1919

2020
let expected_hash: u256 = 0xae3d019b30529c6044d2b3d7ee2e0ee5db51a7f05ed5db8f089cd5d455f1fc5d;
21-
jet_verify(jet_eq_256(ctv_hash, expected_hash));
21+
assert!(jet_eq_256(ctv_hash, expected_hash));
2222
}

example_progs/function.simf

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn checked_add_32(a: u32, b: u32) -> u32 {
22
let (carry, sum): (bool, u32) = jet_add_32(a, b);
3-
jet_verify(<u1>::into(jet_complement_1(<bool>::into(carry))));
3+
assert!(<u1>::into(jet_complement_1(<bool>::into(carry))));
44
sum
55
}
66

@@ -19,9 +19,9 @@ fn third() -> u32 {
1919
fn main() {
2020
let sum: u32 = checked_add_32(42, 1);
2121
let expected: u32 = 43;
22-
jet_verify(jet_eq_32(expected, sum));
22+
assert!(jet_eq_32(expected, sum));
2323

2424
let third: u32 = third();
2525
let expected: u32 = 3;
26-
jet_verify(jet_eq_32(expected, third));
26+
assert!(jet_eq_32(expected, third));
2727
}

example_progs/match.simf

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ fn main() {
33
Left(x: u32) => jet_le_32(10, x),
44
Right(y: u32) => jet_le_32(y, 10),
55
};
6-
jet_verify(bit);
6+
assert!(bit);
77
let bit: bool = match Some(11) {
88
Some(x: u32) => jet_le_32(10, x),
99
None => false,
1010
};
11-
jet_verify(bit);
11+
assert!(bit);
1212
let bit: bool = match false {
1313
true => false,
1414
false => true,
1515
};
16-
jet_verify(bit);
16+
assert!(bit);
1717
}

example_progs/nesting.simf

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ fn main() {
77
v4
88
};
99
let res: u32 = 1;
10-
jet_verify(jet_eq_32(res, v1));
10+
assert!(jet_eq_32(res, v1));
1111
}

example_progs/option.simf

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ fn checked_div_32(x: u32, y: u32) -> Option<u32> {
77

88
fn main() {
99
let res: Option<u32> = checked_div_32(10, 3);
10-
jet_verify(jet_eq_32(3, unwrap(res)));
10+
assert!(jet_eq_32(3, unwrap(res)));
1111
}

example_progs/recursive-covenant.simf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
fn main () {
77
let this_hash: u256 = jet_current_script_hash();
88
let spend_hash: u256 = unwrap(jet_output_script_hash(0));
9-
jet_verify(jet_eq_256(this_hash, spend_hash));
9+
assert!(jet_eq_256(this_hash, spend_hash));
1010
}

example_progs/scopes.simf

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ fn main() {
55
let v3: u32 = {
66
let v4: u32 = 2;
77
let v5: u32 = 3;
8-
jet_verify(jet_eq_32(v7, 10)); /* Can use upper scope variables here.*/
8+
assert!(jet_eq_32(v7, 10)); /* Can use upper scope variables here.*/
99
let v7: u32 = 7; /* Can also shadow the upper scope here.*/
1010
jet_max_32(jet_max_32(v4, v5),v7) /* Rust like, missing ; here is the return type of expression.*/
1111
};
12-
jet_verify(jet_eq_32(v7, 10)); /* Upper scope is same just like regular Programming languages*/
12+
assert!(jet_eq_32(v7, 10)); /* Upper scope is same just like regular Programming languages*/
1313
jet_min_32(v7, v3) /*Return value of v2 block*/
1414
};
1515
v2
1616
};
17-
jet_verify(jet_eq_32(7, v1));
17+
assert!(jet_eq_32(7, v1));
1818
}

example_progs/sighash_all.simf

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fn main () {
1818
let ctx: Ctx8 = jet_sha_256_ctx_8_add_4(ctx, jet_current_index());
1919
let sig_all_hash: u256 = jet_sha_256_ctx_8_finalize(ctx);
2020
let expected: u256= jet_sig_all_hash();
21-
jet_verify(jet_eq_256(sig_all_hash, expected));
21+
assert!(jet_eq_256(sig_all_hash, expected));
2222

2323
// jet_tx_hash
2424
let ctx: Ctx8 = jet_sha_256_ctx_8_init();
@@ -31,7 +31,7 @@ fn main () {
3131
let ctx: Ctx8 = jet_sha_256_ctx_8_add_32(ctx, jet_input_utxos_hash());
3232
let tx_hash: u256 = jet_sha_256_ctx_8_finalize(ctx);
3333
let expected: u256 = jet_tx_hash();
34-
jet_verify(jet_eq_256(tx_hash, expected));
34+
assert!(jet_eq_256(tx_hash, expected));
3535

3636
// jet_inputs_hash
3737
let ctx: Ctx8 = jet_sha_256_ctx_8_init();
@@ -40,7 +40,7 @@ fn main () {
4040
let ctx: Ctx8 = jet_sha_256_ctx_8_add_32(ctx, jet_input_annexes_hash());
4141
let inputs_hash: u256 = jet_sha_256_ctx_8_finalize(ctx);
4242
let expected: u256 = jet_inputs_hash();
43-
jet_verify(jet_eq_256(inputs_hash, expected));
43+
assert!(jet_eq_256(inputs_hash, expected));
4444

4545
// jet_outputs_hash
4646
let ctx: Ctx8 = jet_sha_256_ctx_8_init();
@@ -50,7 +50,7 @@ fn main () {
5050
let ctx: Ctx8 = jet_sha_256_ctx_8_add_32(ctx, jet_output_range_proofs_hash());
5151
let outputs_hash: u256 = jet_sha_256_ctx_8_finalize(ctx);
5252
let expected: u256 = jet_outputs_hash();
53-
jet_verify(jet_eq_256(outputs_hash, expected));
53+
assert!(jet_eq_256(outputs_hash, expected));
5454

5555
// jet_issuances_hash
5656
let ctx: Ctx8 = jet_sha_256_ctx_8_init();
@@ -60,15 +60,15 @@ fn main () {
6060
let ctx: Ctx8 = jet_sha_256_ctx_8_add_32(ctx, jet_issuance_blinding_entropy_hash());
6161
let issuances_hash: u256 = jet_sha_256_ctx_8_finalize(ctx);
6262
let expected: u256 = jet_issuances_hash();
63-
jet_verify(jet_eq_256(issuances_hash, expected));
63+
assert!(jet_eq_256(issuances_hash, expected));
6464

6565
// jet_input_utxos_hash
6666
let ctx: Ctx8 = jet_sha_256_ctx_8_init();
6767
let ctx: Ctx8 = jet_sha_256_ctx_8_add_32(ctx, jet_input_amounts_hash());
6868
let ctx: Ctx8 = jet_sha_256_ctx_8_add_32(ctx, jet_input_scripts_hash());
6969
let input_utxos_hash: u256 = jet_sha_256_ctx_8_finalize(ctx);
7070
let expected: u256 = jet_input_utxos_hash();
71-
jet_verify(jet_eq_256(input_utxos_hash, expected));
71+
assert!(jet_eq_256(input_utxos_hash, expected));
7272

7373
// jet_tap_env_hash
7474
let ctx: Ctx8 = jet_sha_256_ctx_8_init();
@@ -77,5 +77,5 @@ fn main () {
7777
let ctx: Ctx8 = jet_sha_256_ctx_8_add_32(ctx, jet_internal_key());
7878
let tap_env_hash: u256 = jet_sha_256_ctx_8_finalize(ctx);
7979
let expected: u256 = jet_tap_env_hash();
80-
jet_verify(jet_eq_256(tap_env_hash, expected));
80+
assert!(jet_eq_256(tap_env_hash, expected));
8181
}

example_progs/tuple.simf

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ fn main() {
77
let (e,): (u32,) = b;
88
let (f,g): (u32,u32) = c;
99
let (h,i,j): (u32,u32,u32) = d;
10-
jet_verify(jet_eq_32(e,1));
11-
jet_verify(jet_eq_32(f,2));
12-
jet_verify(jet_eq_32(g,3));
13-
jet_verify(jet_eq_32(h,4));
14-
jet_verify(jet_eq_32(i,5));
15-
jet_verify(jet_eq_32(j,6));
10+
assert!(jet_eq_32(e,1));
11+
assert!(jet_eq_32(f,2));
12+
assert!(jet_eq_32(g,3));
13+
assert!(jet_eq_32(h,4));
14+
assert!(jet_eq_32(i,5));
15+
assert!(jet_eq_32(j,6));
1616
}

example_progs/unwrap.simf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
fn main() {
22
let l_or_r: Either<Height, Time> = jet_parse_lock(10);
33
let l: u32 = unwrap_left::<Time>(l_or_r);
4-
jet_verify(jet_eq_32(l, 10));
4+
assert!(jet_eq_32(l, 10));
55
let l_or_r: Either<Height, Time> = jet_parse_lock(1000000000);
66
let r: u32 = unwrap_right::<Height>(l_or_r);
7-
jet_verify(jet_eq_32(r, 1000000000));
7+
assert!(jet_eq_32(r, 1000000000));
88
}

0 commit comments

Comments
 (0)