Skip to content

Commit 3ed085b

Browse files
apoelstraapoelstra
committed
simplicity-sys: rename sizeof and alignof variables
1 parent fbcadbf commit 3ed085b

File tree

3 files changed

+72
-66
lines changed

3 files changed

+72
-66
lines changed

‎simplicity-sys/depend/env.c

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,49 @@ typedef rawElementsOutput rawOutput;
1010
typedef rawElementsInput rawInput;
1111
typedef rawElementsTransaction rawTransaction;
1212
typedef rawElementsTapEnv rawTapEnv;
13-
14-
const size_t rustsimplicity_0_5_c_sizeof_rawBuffer = sizeof(rawBuffer);
15-
const size_t rustsimplicity_0_5_c_sizeof_rawOutput = sizeof(rawOutput);
16-
const size_t rustsimplicity_0_5_c_sizeof_rawInput = sizeof(rawInput);
17-
const size_t rustsimplicity_0_5_c_sizeof_rawTransaction = sizeof(rawTransaction);
18-
const size_t rustsimplicity_0_5_c_sizeof_rawTapEnv = sizeof(rawTapEnv);
13+
14+
const size_t rustsimplicity_0_5_c_sizeof_rawElementsBuffer = sizeof(rawElementsBuffer);
15+
const size_t rustsimplicity_0_5_c_sizeof_rawElementsOutput = sizeof(rawElementsOutput);
16+
const size_t rustsimplicity_0_5_c_sizeof_rawElementsInput = sizeof(rawElementsInput);
17+
const size_t rustsimplicity_0_5_c_sizeof_rawElementsTransaction = sizeof(rawElementsTransaction);
18+
const size_t rustsimplicity_0_5_c_sizeof_rawElementsTapEnv = sizeof(rawElementsTapEnv);
1919
const size_t rustsimplicity_0_5_c_sizeof_txEnv = sizeof(txEnv);
2020

21-
const size_t rustsimplicity_0_5_c_alignof_rawBuffer = alignof(rawBuffer);
22-
const size_t rustsimplicity_0_5_c_alignof_rawOutput = alignof(rawOutput);
23-
const size_t rustsimplicity_0_5_c_alignof_rawInput = alignof(rawInput);
24-
const size_t rustsimplicity_0_5_c_alignof_rawTransaction = alignof(rawTransaction);
25-
const size_t rustsimplicity_0_5_c_alignof_rawTapEnv = alignof(rawTapEnv);
21+
const size_t rustsimplicity_0_5_c_alignof_rawElementsBuffer = alignof(rawElementsBuffer);
22+
const size_t rustsimplicity_0_5_c_alignof_rawElementsOutput = alignof(rawElementsOutput);
23+
const size_t rustsimplicity_0_5_c_alignof_rawElementsInput = alignof(rawElementsInput);
24+
const size_t rustsimplicity_0_5_c_alignof_rawElementsTransaction = alignof(rawElementsTransaction);
25+
const size_t rustsimplicity_0_5_c_alignof_rawElementsTapEnv = alignof(rawElementsTapEnv);
2626
const size_t rustsimplicity_0_5_c_alignof_txEnv = alignof(txEnv);
2727

28-
void rustsimplicity_0_5_c_set_rawBuffer(rawBuffer *result, const unsigned char *buf, unsigned int len)
28+
void rustsimplicity_0_5_c_set_rawBuffer(rawElementsBuffer *result, const unsigned char *buf, unsigned int len)
2929
{
30-
*result = (rawBuffer){.buf = buf, .len = len};
30+
*result = (rawElementsBuffer){.buf = buf, .len = len};
3131
}
3232

33-
void rustsimplicity_0_5_c_set_rawOutput(rawOutput *result, const unsigned char *asset, const unsigned char *value, const unsigned char *nonce, const rawBuffer *scriptPubKey,
34-
const rawBuffer *surjectionProof, const rawBuffer *rangeProof)
33+
void rustsimplicity_0_5_c_set_rawOutput(rawElementsOutput *result, const unsigned char *asset, const unsigned char *value, const unsigned char *nonce, const rawElementsBuffer *scriptPubKey,
34+
const rawElementsBuffer *surjectionProof, const rawElementsBuffer *rangeProof)
3535
{
36-
*result = (rawOutput){.asset = asset, .value = value, .nonce = nonce, .scriptPubKey = *scriptPubKey, .surjectionProof = *surjectionProof, .rangeProof = *rangeProof};
36+
*result = (rawElementsOutput){.asset = asset, .value = value, .nonce = nonce, .scriptPubKey = *scriptPubKey, .surjectionProof = *surjectionProof, .rangeProof = *rangeProof};
3737
}
3838

39-
void rustsimplicity_0_5_c_set_rawInput(rawInput *result, const rawBuffer *annex, const unsigned char *pegin, const rawBuffer *scriptSig,
39+
void rustsimplicity_0_5_c_set_rawInput(rawElementsInput *result, const rawElementsBuffer *annex, const unsigned char *pegin, const rawElementsBuffer *scriptSig,
4040
const unsigned char *prevTxid, unsigned int prevIx,
41-
const unsigned char *asset, const unsigned char *value, const rawBuffer *scriptPubKey,
41+
const unsigned char *asset, const unsigned char *value, const rawElementsBuffer *scriptPubKey,
4242
unsigned int sequence,
4343
const unsigned char *blindingNonce, const unsigned char *assetEntropy, const unsigned char *amount, const unsigned char *inflationKeys,
44-
const rawBuffer *amountRangePrf, const rawBuffer *inflationKeysRangePrf)
44+
const rawElementsBuffer *amountRangePrf, const rawElementsBuffer *inflationKeysRangePrf)
4545
{
46-
*result = (rawInput){.annex = annex, .scriptSig = *scriptSig, .prevTxid = prevTxid, .pegin = pegin, .issuance = {.blindingNonce = blindingNonce, .assetEntropy = assetEntropy, .amount = amount, .inflationKeys = inflationKeys, .amountRangePrf = *amountRangePrf, .inflationKeysRangePrf = *inflationKeysRangePrf}, .txo = {.asset = asset, .value = value, .scriptPubKey = *scriptPubKey}, .prevIx = prevIx, .sequence = sequence};
46+
*result = (rawElementsInput){.annex = annex, .scriptSig = *scriptSig, .prevTxid = prevTxid, .pegin = pegin, .issuance = {.blindingNonce = blindingNonce, .assetEntropy = assetEntropy, .amount = amount, .inflationKeys = inflationKeys, .amountRangePrf = *amountRangePrf, .inflationKeysRangePrf = *inflationKeysRangePrf}, .txo = {.asset = asset, .value = value, .scriptPubKey = *scriptPubKey}, .prevIx = prevIx, .sequence = sequence};
4747
}
4848

49-
void rustsimplicity_0_5_c_set_rawTransaction(rawTransaction *result, unsigned int version,
49+
void rustsimplicity_0_5_c_set_rawTransaction(rawElementsTransaction *result, unsigned int version,
5050
const unsigned char *txid,
51-
const rawInput *input, unsigned int numInputs,
52-
const rawOutput *output, unsigned int numOutputs,
51+
const rawElementsInput *input, unsigned int numInputs,
52+
const rawElementsOutput *output, unsigned int numOutputs,
5353
unsigned int lockTime)
5454
{
55-
*result = (rawTransaction){
55+
*result = (rawElementsTransaction){
5656
.version = version,
5757
.txid = txid,
5858
.input = input,
@@ -63,9 +63,9 @@ void rustsimplicity_0_5_c_set_rawTransaction(rawTransaction *result, unsigned in
6363
};
6464
}
6565

66-
void rustsimplicity_0_5_c_set_rawTapEnv(rawTapEnv *result, const unsigned char *controlBlock, unsigned char pathLen, const unsigned char *scriptCMR)
66+
void rustsimplicity_0_5_c_set_rawTapEnv(rawElementsTapEnv *result, const unsigned char *controlBlock, unsigned char pathLen, const unsigned char *scriptCMR)
6767
{
68-
*result = (rawTapEnv){.controlBlock = controlBlock, .pathLen = pathLen, .scriptCMR = scriptCMR};
68+
*result = (rawElementsTapEnv){.controlBlock = controlBlock, .pathLen = pathLen, .scriptCMR = scriptCMR};
6969
}
7070

7171
void rustsimplicity_0_5_c_set_txEnv(txEnv *result, const elementsTransaction *tx, const elementsTapEnv *taproot, const unsigned char *genesisHash, unsigned int ix)

‎simplicity-sys/src/c_jets/c_env.rs

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -125,29 +125,29 @@ pub struct CElementsTxEnv {
125125
pub enum CTapEnv {}
126126

127127
extern "C" {
128-
#[link_name = "rustsimplicity_0_5_c_sizeof_rawBuffer"]
129-
pub static c_sizeof_rawBuffer: c_size_t;
130-
#[link_name = "rustsimplicity_0_5_c_sizeof_rawOutput"]
131-
pub static c_sizeof_rawOutput: c_size_t;
132-
#[link_name = "rustsimplicity_0_5_c_sizeof_rawInput"]
133-
pub static c_sizeof_rawInput: c_size_t;
134-
#[link_name = "rustsimplicity_0_5_c_sizeof_rawTransaction"]
135-
pub static c_sizeof_rawTransaction: c_size_t;
136-
#[link_name = "rustsimplicity_0_5_c_sizeof_rawTapEnv"]
137-
pub static c_sizeof_rawTapEnv: c_size_t;
128+
#[link_name = "rustsimplicity_0_5_c_sizeof_rawElementsBuffer"]
129+
pub static c_sizeof_rawElementsBuffer: c_size_t;
130+
#[link_name = "rustsimplicity_0_5_c_sizeof_rawElementsOutput"]
131+
pub static c_sizeof_rawElementsOutput: c_size_t;
132+
#[link_name = "rustsimplicity_0_5_c_sizeof_rawElementsInput"]
133+
pub static c_sizeof_rawElementsInput: c_size_t;
134+
#[link_name = "rustsimplicity_0_5_c_sizeof_rawElementsTransaction"]
135+
pub static c_sizeof_rawElementsTransaction: c_size_t;
136+
#[link_name = "rustsimplicity_0_5_c_sizeof_rawElementsTapEnv"]
137+
pub static c_sizeof_rawElementsTapEnv: c_size_t;
138138
#[link_name = "rustsimplicity_0_5_c_sizeof_txEnv"]
139139
pub static c_sizeof_txEnv: c_size_t;
140140

141-
#[link_name = "rustsimplicity_0_5_c_alignof_rawBuffer"]
142-
pub static c_alignof_rawBuffer: c_size_t;
143-
#[link_name = "rustsimplicity_0_5_c_alignof_rawOutput"]
144-
pub static c_alignof_rawOutput: c_size_t;
145-
#[link_name = "rustsimplicity_0_5_c_alignof_rawInput"]
146-
pub static c_alignof_rawInput: c_size_t;
147-
#[link_name = "rustsimplicity_0_5_c_alignof_rawTransaction"]
148-
pub static c_alignof_rawTransaction: c_size_t;
149-
#[link_name = "rustsimplicity_0_5_c_alignof_rawTapEnv"]
150-
pub static c_alignof_rawTapEnv: c_size_t;
141+
#[link_name = "rustsimplicity_0_5_c_alignof_rawElementsBuffer"]
142+
pub static c_alignof_rawElementsBuffer: c_size_t;
143+
#[link_name = "rustsimplicity_0_5_c_alignof_rawElementsOutput"]
144+
pub static c_alignof_rawElementsOutput: c_size_t;
145+
#[link_name = "rustsimplicity_0_5_c_alignof_rawElementsInput"]
146+
pub static c_alignof_rawElementsInput: c_size_t;
147+
#[link_name = "rustsimplicity_0_5_c_alignof_rawElementsTransaction"]
148+
pub static c_alignof_rawElementsTransaction: c_size_t;
149+
#[link_name = "rustsimplicity_0_5_c_alignof_rawElementsTapEnv"]
150+
pub static c_alignof_rawElementsTapEnv: c_size_t;
151151
#[link_name = "rustsimplicity_0_5_c_alignof_txEnv"]
152152
pub static c_alignof_txEnv: c_size_t;
153153

@@ -257,11 +257,14 @@ mod tests {
257257
fn test_sizes() {
258258
unsafe {
259259
assert_eq!(size_of::<CFrameItem>(), c_sizeof_frameItem);
260-
assert_eq!(size_of::<CRawBuffer>(), c_sizeof_rawBuffer);
261-
assert_eq!(size_of::<CRawInput>(), c_sizeof_rawInput);
262-
assert_eq!(size_of::<CRawOutput>(), c_sizeof_rawOutput);
263-
assert_eq!(size_of::<CRawTransaction>(), c_sizeof_rawTransaction);
264-
assert_eq!(size_of::<CRawTapEnv>(), c_sizeof_rawTapEnv);
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);
263+
assert_eq!(
264+
size_of::<CRawTransaction>(),
265+
c_sizeof_rawElementsTransaction
266+
);
267+
assert_eq!(size_of::<CRawTapEnv>(), c_sizeof_rawElementsTapEnv);
265268
assert_eq!(size_of::<CElementsTxEnv>(), c_sizeof_txEnv);
266269
}
267270
}
@@ -270,11 +273,14 @@ mod tests {
270273
fn test_aligns() {
271274
unsafe {
272275
assert_eq!(align_of::<CFrameItem>(), c_alignof_frameItem);
273-
assert_eq!(align_of::<CRawBuffer>(), c_alignof_rawBuffer);
274-
assert_eq!(align_of::<CRawInput>(), c_alignof_rawInput);
275-
assert_eq!(align_of::<CRawOutput>(), c_alignof_rawOutput);
276-
assert_eq!(align_of::<CRawTransaction>(), c_alignof_rawTransaction);
277-
assert_eq!(align_of::<CRawTapEnv>(), c_alignof_rawTapEnv);
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+
assert_eq!(
280+
align_of::<CRawTransaction>(),
281+
c_alignof_rawElementsTransaction
282+
);
283+
assert_eq!(align_of::<CRawTapEnv>(), c_alignof_rawElementsTapEnv);
278284
assert_eq!(align_of::<CElementsTxEnv>(), c_alignof_txEnv);
279285
}
280286
}

‎simplicity-sys/src/c_jets/mod.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,23 @@ pub fn sanity_checks() -> bool {
3838
}
3939

4040
if std::mem::size_of::<CFrameItem>() != frame_ffi::c_sizeof_frameItem
41-
|| std::mem::size_of::<CRawBuffer>() != c_env::c_sizeof_rawBuffer
42-
|| std::mem::size_of::<CRawInput>() != c_env::c_sizeof_rawInput
43-
|| std::mem::size_of::<CRawOutput>() != c_env::c_sizeof_rawOutput
44-
|| std::mem::size_of::<CRawTransaction>() != c_env::c_sizeof_rawTransaction
41+
|| std::mem::size_of::<CRawBuffer>() != c_env::c_sizeof_rawElementsBuffer
42+
|| std::mem::size_of::<CRawInput>() != c_env::c_sizeof_rawElementsInput
43+
|| std::mem::size_of::<CRawOutput>() != c_env::c_sizeof_rawElementsOutput
44+
|| std::mem::size_of::<CRawTransaction>() != c_env::c_sizeof_rawElementsTransaction
4545
|| std::mem::size_of::<CElementsTxEnv>() != c_env::c_sizeof_txEnv
46-
|| std::mem::size_of::<CRawTapEnv>() != c_env::c_sizeof_rawTapEnv
46+
|| std::mem::size_of::<CRawTapEnv>() != c_env::c_sizeof_rawElementsTapEnv
4747
{
4848
return false;
4949
}
5050

5151
if std::mem::align_of::<CFrameItem>() != frame_ffi::c_alignof_frameItem
52-
|| std::mem::align_of::<CRawBuffer>() != c_env::c_alignof_rawBuffer
53-
|| std::mem::align_of::<CRawInput>() != c_env::c_alignof_rawInput
54-
|| std::mem::align_of::<CRawOutput>() != c_env::c_alignof_rawOutput
55-
|| std::mem::align_of::<CRawTransaction>() != c_env::c_alignof_rawTransaction
52+
|| std::mem::align_of::<CRawBuffer>() != c_env::c_alignof_rawElementsBuffer
53+
|| std::mem::align_of::<CRawInput>() != c_env::c_alignof_rawElementsInput
54+
|| std::mem::align_of::<CRawOutput>() != c_env::c_alignof_rawElementsOutput
55+
|| std::mem::align_of::<CRawTransaction>() != c_env::c_alignof_rawElementsTransaction
5656
|| std::mem::align_of::<CElementsTxEnv>() != c_env::c_alignof_txEnv
57-
|| std::mem::align_of::<CRawTapEnv>() != c_env::c_alignof_rawTapEnv
57+
|| std::mem::align_of::<CRawTapEnv>() != c_env::c_alignof_rawElementsTapEnv
5858
{
5959
return false;
6060
}

0 commit comments

Comments
 (0)