@@ -28,7 +28,7 @@ pub struct RawOutputData {
28
28
29
29
#[ derive( Debug ) ]
30
30
#[ repr( C ) ]
31
- pub struct CRawBuffer {
31
+ pub struct CElementsRawBuffer {
32
32
pub ptr : * const c_uchar ,
33
33
pub len : u32 ,
34
34
}
@@ -56,44 +56,44 @@ pub struct RawTransactionData {
56
56
57
57
#[ derive( Debug ) ]
58
58
#[ repr( C ) ]
59
- pub struct CRawOutput {
59
+ pub struct CElementsRawOutput {
60
60
asset : * const c_uchar ,
61
61
value : * const c_uchar ,
62
62
nonce : * const c_uchar ,
63
- script_pubkey : CRawBuffer ,
64
- surjection_proof : CRawBuffer ,
65
- range_proof : CRawBuffer ,
63
+ script_pubkey : CElementsRawBuffer ,
64
+ surjection_proof : CElementsRawBuffer ,
65
+ range_proof : CElementsRawBuffer ,
66
66
}
67
67
68
68
#[ derive( Debug ) ]
69
69
#[ repr( C ) ]
70
- pub struct CRawInput {
71
- annex : * const CRawBuffer ,
70
+ pub struct CElementsRawInput {
71
+ annex : * const CElementsRawBuffer ,
72
72
prev_txid : * const c_uchar ,
73
73
pegin : * const c_uchar ,
74
74
// issuance
75
75
blinding_nonce : * const c_uchar ,
76
76
asset_entropy : * const c_uchar ,
77
77
amount : * const c_uchar ,
78
78
inflation_keys : * const c_uchar ,
79
- amount_range_proof : CRawBuffer ,
80
- inflation_keys_range_proof : CRawBuffer ,
79
+ amount_range_proof : CElementsRawBuffer ,
80
+ inflation_keys_range_proof : CElementsRawBuffer ,
81
81
// spent txo
82
82
asset : * const c_uchar ,
83
83
value : * const c_uchar ,
84
- script_pubkey : CRawBuffer ,
84
+ script_pubkey : CElementsRawBuffer ,
85
85
// inputs
86
- script_sig : CRawBuffer ,
86
+ script_sig : CElementsRawBuffer ,
87
87
prev_txout_index : u32 ,
88
88
sequence : u32 ,
89
89
}
90
90
91
91
#[ derive( Debug ) ]
92
92
#[ repr( C ) ]
93
- pub struct CRawTransaction {
93
+ pub struct CElementsRawTransaction {
94
94
txid : * const c_uchar ,
95
- inputs : * const CRawInput ,
96
- outputs : * const CRawOutput ,
95
+ inputs : * const CElementsRawInput ,
96
+ outputs : * const CElementsRawOutput ,
97
97
version : u32 ,
98
98
locktime : u32 ,
99
99
n_inputs : u32 ,
@@ -102,7 +102,7 @@ pub struct CRawTransaction {
102
102
103
103
#[ derive( Debug ) ]
104
104
#[ repr( C ) ]
105
- pub struct CRawTapEnv {
105
+ pub struct CElementsRawTapEnv {
106
106
control_block : * const c_uchar ,
107
107
script_cmr : * const c_uchar ,
108
108
branch_len : u8 ,
@@ -152,51 +152,51 @@ extern "C" {
152
152
pub static c_alignof_txEnv: c_size_t ;
153
153
154
154
#[ link_name = "rustsimplicity_0_5_c_set_rawElementsBuffer" ]
155
- pub fn c_set_rawElementsBuffer ( res : * mut CRawBuffer , buf : * const c_uchar , len : c_uint ) ;
155
+ pub fn c_set_rawElementsBuffer ( res : * mut CElementsRawBuffer , buf : * const c_uchar , len : c_uint ) ;
156
156
#[ link_name = "rustsimplicity_0_5_c_set_rawElementsOutput" ]
157
157
pub fn c_set_rawElementsOutput (
158
- res : * mut CRawOutput ,
158
+ res : * mut CElementsRawOutput ,
159
159
asset : * const c_uchar ,
160
160
value : * const c_uchar ,
161
161
nonce : * const c_uchar ,
162
- scriptPubKey : * const CRawBuffer ,
163
- surjectionProof : * const CRawBuffer ,
164
- rangeProof : * const CRawBuffer ,
162
+ scriptPubKey : * const CElementsRawBuffer ,
163
+ surjectionProof : * const CElementsRawBuffer ,
164
+ rangeProof : * const CElementsRawBuffer ,
165
165
) ;
166
166
#[ link_name = "rustsimplicity_0_5_c_set_rawElementsInput" ]
167
167
pub fn c_set_rawElementsInput (
168
- result : * mut CRawInput ,
169
- annex : * const CRawBuffer ,
168
+ result : * mut CElementsRawInput ,
169
+ annex : * const CElementsRawBuffer ,
170
170
pegin : * const c_uchar ,
171
- scriptSig : * const CRawBuffer ,
171
+ scriptSig : * const CElementsRawBuffer ,
172
172
prevTxid : * const c_uchar ,
173
173
prevIx : c_uint ,
174
174
asset : * const c_uchar ,
175
175
value : * const c_uchar ,
176
- scriptPubKey : * const CRawBuffer ,
176
+ scriptPubKey : * const CElementsRawBuffer ,
177
177
sequence : c_uint ,
178
178
blindingNonce : * const c_uchar ,
179
179
assetEntropy : * const c_uchar ,
180
180
amount : * const c_uchar ,
181
181
inflationKeys : * const c_uchar ,
182
- amountRangePrf : * const CRawBuffer ,
183
- inflationKeysRangePrf : * const CRawBuffer ,
182
+ amountRangePrf : * const CElementsRawBuffer ,
183
+ inflationKeysRangePrf : * const CElementsRawBuffer ,
184
184
) ;
185
185
186
186
#[ link_name = "rustsimplicity_0_5_c_set_rawElementsTransaction" ]
187
187
pub fn c_set_rawElementsTransaction (
188
- result : * mut CRawTransaction ,
188
+ result : * mut CElementsRawTransaction ,
189
189
version : c_uint ,
190
190
txid : * const c_uchar ,
191
- input : * const CRawInput ,
191
+ input : * const CElementsRawInput ,
192
192
numInputs : c_uint ,
193
- output : * const CRawOutput ,
193
+ output : * const CElementsRawOutput ,
194
194
numOutputs : c_uint ,
195
195
lockTime : c_uint ,
196
196
) ;
197
197
#[ link_name = "rustsimplicity_0_5_c_set_rawElementsTapEnv" ]
198
198
pub fn c_set_rawElementsTapEnv (
199
- result : * mut CRawTapEnv ,
199
+ result : * mut CElementsRawTapEnv ,
200
200
controlBlock : * const c_uchar ,
201
201
pathLen : c_uchar ,
202
202
scriptCMR : * const c_uchar ,
@@ -210,10 +210,10 @@ extern "C" {
210
210
ix : c_uint ,
211
211
) ;
212
212
#[ link_name = "rustsimplicity_0_5_elements_mallocTapEnv" ]
213
- pub fn simplicity_elements_mallocTapEnv ( rawEnv : * const CRawTapEnv ) -> * mut CTapEnv ;
213
+ pub fn simplicity_elements_mallocTapEnv ( rawEnv : * const CElementsRawTapEnv ) -> * mut CTapEnv ;
214
214
#[ link_name = "rustsimplicity_0_5_elements_mallocTransaction" ]
215
215
pub fn simplicity_elements_mallocTransaction (
216
- rawTx : * const CRawTransaction ,
216
+ rawTx : * const CElementsRawTransaction ,
217
217
) -> * mut CTransaction ;
218
218
#[ link_name = "rustsimplicity_0_5_c_free_transaction" ]
219
219
pub fn c_free_transaction ( tx : * mut CTransaction ) ;
@@ -237,10 +237,10 @@ impl Drop for CElementsTxEnv {
237
237
}
238
238
}
239
239
240
- impl CRawBuffer {
240
+ impl CElementsRawBuffer {
241
241
pub fn new ( buf : & [ c_uchar ] ) -> Self {
242
242
unsafe {
243
- let mut raw_buffer = std:: mem:: MaybeUninit :: < CRawBuffer > :: uninit ( ) ;
243
+ let mut raw_buffer = std:: mem:: MaybeUninit :: < Self > :: uninit ( ) ;
244
244
c_set_rawElementsBuffer ( raw_buffer. as_mut_ptr ( ) , buf. as_ptr ( ) , buf. len ( ) as c_uint ) ;
245
245
raw_buffer. assume_init ( )
246
246
}
@@ -257,14 +257,14 @@ mod tests {
257
257
fn test_sizes ( ) {
258
258
unsafe {
259
259
assert_eq ! ( size_of:: <CFrameItem >( ) , c_sizeof_frameItem) ;
260
- assert_eq ! ( size_of:: <CRawBuffer >( ) , c_sizeof_rawElementsBuffer) ;
261
- assert_eq ! ( size_of:: <CRawInput >( ) , c_sizeof_rawElementsInput) ;
262
- assert_eq ! ( size_of:: <CRawOutput >( ) , c_sizeof_rawElementsOutput) ;
260
+ assert_eq ! ( size_of:: <CElementsRawBuffer >( ) , c_sizeof_rawElementsBuffer) ;
261
+ assert_eq ! ( size_of:: <CElementsRawInput >( ) , c_sizeof_rawElementsInput) ;
262
+ assert_eq ! ( size_of:: <CElementsRawOutput >( ) , c_sizeof_rawElementsOutput) ;
263
263
assert_eq ! (
264
- size_of:: <CRawTransaction >( ) ,
264
+ size_of:: <CElementsRawTransaction >( ) ,
265
265
c_sizeof_rawElementsTransaction
266
266
) ;
267
- assert_eq ! ( size_of:: <CRawTapEnv >( ) , c_sizeof_rawElementsTapEnv) ;
267
+ assert_eq ! ( size_of:: <CElementsRawTapEnv >( ) , c_sizeof_rawElementsTapEnv) ;
268
268
assert_eq ! ( size_of:: <CElementsTxEnv >( ) , c_sizeof_txEnv) ;
269
269
}
270
270
}
@@ -273,14 +273,23 @@ mod tests {
273
273
fn test_aligns ( ) {
274
274
unsafe {
275
275
assert_eq ! ( align_of:: <CFrameItem >( ) , c_alignof_frameItem) ;
276
- assert_eq ! ( align_of:: <CRawBuffer >( ) , c_alignof_rawElementsBuffer) ;
277
- assert_eq ! ( align_of:: <CRawInput >( ) , c_alignof_rawElementsInput) ;
278
- assert_eq ! ( align_of:: <CRawOutput >( ) , c_alignof_rawElementsOutput) ;
279
276
assert_eq ! (
280
- align_of:: <CRawTransaction >( ) ,
277
+ align_of:: <CElementsRawBuffer >( ) ,
278
+ c_alignof_rawElementsBuffer
279
+ ) ;
280
+ assert_eq ! ( align_of:: <CElementsRawInput >( ) , c_alignof_rawElementsInput) ;
281
+ assert_eq ! (
282
+ align_of:: <CElementsRawOutput >( ) ,
283
+ c_alignof_rawElementsOutput
284
+ ) ;
285
+ assert_eq ! (
286
+ align_of:: <CElementsRawTransaction >( ) ,
281
287
c_alignof_rawElementsTransaction
282
288
) ;
283
- assert_eq ! ( align_of:: <CRawTapEnv >( ) , c_alignof_rawElementsTapEnv) ;
289
+ assert_eq ! (
290
+ align_of:: <CElementsRawTapEnv >( ) ,
291
+ c_alignof_rawElementsTapEnv
292
+ ) ;
284
293
assert_eq ! ( align_of:: <CElementsTxEnv >( ) , c_alignof_txEnv) ;
285
294
}
286
295
}
0 commit comments