simplicity-sys: rename c_raw_set functions

We leave txEnv alone because that's what's done in Haskell/cbits. When
we add the 'bitcoin' feature we will figure out exactly what we're
supposed to do here.

Author: apoelstra

simplicity-sys/depend/env.c

@@ -25,18 +25,18 @@ const size_t rustsimplicity_0_5_c_alignof_rawElementsTransaction = alignof(rawEl
 const size_t rustsimplicity_0_5_c_alignof_rawElementsTapEnv = alignof(rawElementsTapEnv);
 const size_t rustsimplicity_0_5_c_alignof_txEnv = alignof(txEnv);
 
-void rustsimplicity_0_5_c_set_rawBuffer(rawElementsBuffer *result, const unsigned char *buf, unsigned int len)
+void rustsimplicity_0_5_c_set_rawElementsBuffer(rawElementsBuffer *result, const unsigned char *buf, unsigned int len)
 {
     *result = (rawElementsBuffer){.buf = buf, .len = len};
 }
 
-void rustsimplicity_0_5_c_set_rawOutput(rawElementsOutput *result, const unsigned char *asset, const unsigned char *value, const unsigned char *nonce, const rawElementsBuffer *scriptPubKey,
+void rustsimplicity_0_5_c_set_rawElementsOutput(rawElementsOutput *result, const unsigned char *asset, const unsigned char *value, const unsigned char *nonce, const rawElementsBuffer *scriptPubKey,
                      const rawElementsBuffer *surjectionProof, const rawElementsBuffer *rangeProof)
 {
     *result = (rawElementsOutput){.asset = asset, .value = value, .nonce = nonce, .scriptPubKey = *scriptPubKey, .surjectionProof = *surjectionProof, .rangeProof = *rangeProof};
 }
 
-void rustsimplicity_0_5_c_set_rawInput(rawElementsInput *result, const rawElementsBuffer *annex, const unsigned char *pegin, const rawElementsBuffer *scriptSig,
+void rustsimplicity_0_5_c_set_rawElementsInput(rawElementsInput *result, const rawElementsBuffer *annex, const unsigned char *pegin, const rawElementsBuffer *scriptSig,
                     const unsigned char *prevTxid, unsigned int prevIx,
                     const unsigned char *asset, const unsigned char *value, const rawElementsBuffer *scriptPubKey,
                     unsigned int sequence,
@@ -46,7 +46,7 @@ void rustsimplicity_0_5_c_set_rawInput(rawElementsInput *result, const rawElemen
     *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};
 }
 
-void rustsimplicity_0_5_c_set_rawTransaction(rawElementsTransaction *result, unsigned int version,
+void rustsimplicity_0_5_c_set_rawElementsTransaction(rawElementsTransaction *result, unsigned int version,
                           const unsigned char *txid,
                           const rawElementsInput *input, unsigned int numInputs,
                           const rawElementsOutput *output, unsigned int numOutputs,
@@ -63,7 +63,7 @@ void rustsimplicity_0_5_c_set_rawTransaction(rawElementsTransaction *result, uns
     };
 }
 
-void rustsimplicity_0_5_c_set_rawTapEnv(rawElementsTapEnv *result, const unsigned char *controlBlock, unsigned char pathLen, const unsigned char *scriptCMR)
+void rustsimplicity_0_5_c_set_rawElementsTapEnv(rawElementsTapEnv *result, const unsigned char *controlBlock, unsigned char pathLen, const unsigned char *scriptCMR)
 {
     *result = (rawElementsTapEnv){.controlBlock = controlBlock, .pathLen = pathLen, .scriptCMR = scriptCMR};
 }

simplicity-sys/src/c_jets/c_env.rs

@@ -151,10 +151,10 @@ extern "C" {
     #[link_name = "rustsimplicity_0_5_c_alignof_txEnv"]
     pub static c_alignof_txEnv: c_size_t;
 
-    #[link_name = "rustsimplicity_0_5_c_set_rawBuffer"]
-    pub fn c_set_rawBuffer(res: *mut CRawBuffer, buf: *const c_uchar, len: c_uint);
-    #[link_name = "rustsimplicity_0_5_c_set_rawOutput"]
-    pub fn c_set_rawOutput(
+    #[link_name = "rustsimplicity_0_5_c_set_rawElementsBuffer"]
+    pub fn c_set_rawElementsBuffer(res: *mut CRawBuffer, buf: *const c_uchar, len: c_uint);
+    #[link_name = "rustsimplicity_0_5_c_set_rawElementsOutput"]
+    pub fn c_set_rawElementsOutput(
         res: *mut CRawOutput,
         asset: *const c_uchar,
         value: *const c_uchar,
@@ -163,8 +163,8 @@ extern "C" {
         surjectionProof: *const CRawBuffer,
         rangeProof: *const CRawBuffer,
     );
-    #[link_name = "rustsimplicity_0_5_c_set_rawInput"]
-    pub fn c_set_rawInput(
+    #[link_name = "rustsimplicity_0_5_c_set_rawElementsInput"]
+    pub fn c_set_rawElementsInput(
         result: *mut CRawInput,
         annex: *const CRawBuffer,
         pegin: *const c_uchar,
@@ -183,8 +183,8 @@ extern "C" {
         inflationKeysRangePrf: *const CRawBuffer,
     );
 
-    #[link_name = "rustsimplicity_0_5_c_set_rawTransaction"]
-    pub fn c_set_rawTransaction(
+    #[link_name = "rustsimplicity_0_5_c_set_rawElementsTransaction"]
+    pub fn c_set_rawElementsTransaction(
         result: *mut CRawTransaction,
         version: c_uint,
         txid: *const c_uchar,
@@ -194,8 +194,8 @@ extern "C" {
         numOutputs: c_uint,
         lockTime: c_uint,
     );
-    #[link_name = "rustsimplicity_0_5_c_set_rawTapEnv"]
-    pub fn c_set_rawTapEnv(
+    #[link_name = "rustsimplicity_0_5_c_set_rawElementsTapEnv"]
+    pub fn c_set_rawElementsTapEnv(
         result: *mut CRawTapEnv,
         controlBlock: *const c_uchar,
         pathLen: c_uchar,
@@ -241,7 +241,7 @@ impl CRawBuffer {
     pub fn new(buf: &[c_uchar]) -> Self {
         unsafe {
             let mut raw_buffer = std::mem::MaybeUninit::<CRawBuffer>::uninit();
-            c_set_rawBuffer(raw_buffer.as_mut_ptr(), buf.as_ptr(), buf.len() as c_uint);
+            c_set_rawElementsBuffer(raw_buffer.as_mut_ptr(), buf.as_ptr(), buf.len() as c_uint);
             raw_buffer.assume_init()
         }
     }

src/jet/elements/c_env.rs

@@ -13,10 +13,11 @@ use elements::{
     taproot::ControlBlock,
 };
 use simplicity_sys::c_jets::c_env::{
-    c_set_rawInput, c_set_rawOutput, c_set_rawTapEnv, c_set_rawTransaction, c_set_txEnv,
-    simplicity_elements_mallocTapEnv, simplicity_elements_mallocTransaction, CElementsTxEnv,
-    CRawBuffer, CRawInput, CRawOutput, CRawTapEnv, CRawTransaction, CTapEnv, CTransaction,
-    RawInputData, RawOutputData, RawTransactionData,
+    c_set_rawElementsInput, c_set_rawElementsOutput, c_set_rawElementsTapEnv,
+    c_set_rawElementsTransaction, c_set_txEnv, simplicity_elements_mallocTapEnv,
+    simplicity_elements_mallocTransaction, CElementsTxEnv, CRawBuffer, CRawInput, CRawOutput,
+    CRawTapEnv, CRawTransaction, CTapEnv, CTransaction, RawInputData, RawOutputData,
+    RawTransactionData,
 };
 
 use crate::merkle::cmr::Cmr;
@@ -26,7 +27,7 @@ use super::ElementsUtxo;
 fn new_raw_output(out: &elements::TxOut, out_data: &RawOutputData) -> CRawOutput {
     unsafe {
         let mut raw_output = std::mem::MaybeUninit::<CRawOutput>::uninit();
-        c_set_rawOutput(
+        c_set_rawElementsOutput(
             raw_output.as_mut_ptr(),
             asset_ptr(out.asset, &out_data.asset),
             value_ptr(out.value, &out_data.value),
@@ -66,7 +67,7 @@ fn new_raw_input(
                     std::ptr::null(),
                 )
             };
-        c_set_rawInput(
+        c_set_rawElementsInput(
             raw_input.as_mut_ptr(),
             opt_ptr(annex_ptr(&inp_data.annex).as_ref()),
             inp.pegin_data()
@@ -141,7 +142,7 @@ pub(super) fn new_tx(tx: &elements::Transaction, in_utxos: &[ElementsUtxo]) -> *
     }
     unsafe {
         let mut raw_tx = std::mem::MaybeUninit::<CRawTransaction>::uninit();
-        c_set_rawTransaction(
+        c_set_rawElementsTransaction(
             raw_tx.as_mut_ptr(),
             tx.version as c_uint,
             AsRef::<[u8]>::as_ref(&txid).as_ptr(),
@@ -160,7 +161,7 @@ pub(super) fn new_tap_env(control_block: &ControlBlock, script_cmr: Cmr) -> *mut
     unsafe {
         let mut raw_tap_env = std::mem::MaybeUninit::<CRawTapEnv>::uninit();
         let cb_ser = control_block.serialize();
-        c_set_rawTapEnv(
+        c_set_rawElementsTapEnv(
             raw_tap_env.as_mut_ptr(),
             cb_ser.as_ptr(),
             control_block.merkle_branch.as_inner().len() as c_uchar,