|
1 | 1 | #![feature(proc_macro_hygiene)]
|
2 | 2 |
|
| 3 | +use bitcoin::ScriptBuf; |
3 | 4 | use bitcoin_script::{bitcoin_script, define_pushable};
|
4 | 5 |
|
5 | 6 | #[test]
|
@@ -52,11 +53,15 @@ fn test_pushable_vectors() {
|
52 | 53 | #[should_panic]
|
53 | 54 | fn test_usize_conversion() {
|
54 | 55 | define_pushable!();
|
55 |
| - let usize_value : usize = 0xFFFFFFFFFFFFFFFF; |
| 56 | + let usize_value: usize = 0xFFFFFFFFFFFFFFFF; |
56 | 57 |
|
| 58 | +<<<<<<< HEAD |
57 | 59 | let _script = bitcoin_script! (
|
58 | 60 | {usize_value}
|
59 | 61 | );
|
| 62 | +======= |
| 63 | + let _script = script!({ usize_value }); |
| 64 | +>>>>>>> 2892b2f (Fix: Parsing all tokens when parsing for loop) |
60 | 65 | }
|
61 | 66 |
|
62 | 67 | #[test]
|
@@ -86,21 +91,32 @@ fn test_minimal_byte_opcode() {
|
86 | 91 | );
|
87 | 92 | }
|
88 | 93 |
|
| 94 | +fn script_from_func() -> ScriptBuf { |
| 95 | + return script! { OP_ADD }; |
| 96 | +} |
| 97 | + |
89 | 98 | #[test]
|
90 | 99 | fn test_for_loop() {
|
91 | 100 | define_pushable!();
|
92 | 101 | let script = bitcoin_script! {
|
93 | 102 | for i in 0..3 {
|
94 | 103 | for k in 0..(3 as u32) {
|
95 | 104 | OP_ADD
|
| 105 | + script_from_func |
| 106 | + OP_SWAP |
96 | 107 | { i }
|
97 | 108 | { k }
|
98 | 109 | }
|
99 | 110 | }
|
| 111 | + OP_ADD |
100 | 112 | };
|
101 | 113 |
|
102 | 114 | assert_eq!(
|
103 | 115 | script.to_bytes(),
|
104 |
| - vec![147, 0, 0, 147, 0, 81, 147, 0, 82, 147, 81, 0, 147, 81, 81, 147, 81, 82, 147, 82, 0, 147, 82, 81, 147, 82, 82] |
| 116 | + vec![ |
| 117 | + 147, 147, 124, 0, 0, 147, 147, 124, 0, 81, 147, 147, 124, 0, 82, 147, 147, 124, 81, 0, |
| 118 | + 147, 147, 124, 81, 81, 147, 147, 124, 81, 82, 147, 147, 124, 82, 0, 147, 147, 124, 82, |
| 119 | + 81, 147, 147, 124, 82, 82, 147 |
| 120 | + ] |
105 | 121 | );
|
106 | 122 | }
|
0 commit comments