Skip to content

Commit e6bf4cc

Browse files
andrei-marinicaandrei-marinica
committed
refactor - call_data renamed to hex_call_data
1 parent f4d2a56 commit e6bf4cc

File tree

14 files changed

+68
-204
lines changed

14 files changed

+68
-204
lines changed

‎contracts/examples/crowdfunding-esdt/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
imports!();
55

6-
use elrond_wasm::CallDataSerializer;
6+
use elrond_wasm::HexCallDataSerializer;
77

88
const ESDT_TRANSFER_STRING: &[u8] = b"ESDTTransfer";
99

@@ -148,7 +148,7 @@ pub trait Crowdfunding {
148148
}
149149

150150
fn pay_esdt(&self, esdt_token_name: &[u8], amount: &BigUint, to: &Address) {
151-
let mut serializer = CallDataSerializer::new(ESDT_TRANSFER_STRING);
151+
let mut serializer = HexCallDataSerializer::new(ESDT_TRANSFER_STRING);
152152
serializer.push_argument_bytes(esdt_token_name);
153153
serializer.push_argument_bytes(amount.to_bytes_be().as_slice());
154154

‎contracts/examples/lottery-esdt/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use lottery_info::LotteryInfo;
1010
use random::Random;
1111
use status::Status;
1212

13-
use elrond_wasm::CallDataSerializer;
13+
use elrond_wasm::HexCallDataSerializer;
1414

1515
const ESDT_TRANSFER_STRING: &[u8] = b"ESDTTransfer";
1616

@@ -315,7 +315,7 @@ pub trait Lottery {
315315
}
316316

317317
fn pay_esdt(&self, esdt_token_name: &[u8], amount: &BigUint, to: &Address) {
318-
let mut serializer = CallDataSerializer::new(ESDT_TRANSFER_STRING);
318+
let mut serializer = HexCallDataSerializer::new(ESDT_TRANSFER_STRING);
319319
serializer.push_argument_bytes(esdt_token_name);
320320
serializer.push_argument_bytes(amount.to_bytes_be().as_slice());
321321

‎contracts/examples/multisig/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ mod action;
44
mod user_role;
55

66
use action::Action;
7-
use elrond_wasm::CallDataSerializer;
7+
use elrond_wasm::HexCallDataSerializer;
88
use user_role::UserRole;
99

1010
imports!();
@@ -353,7 +353,7 @@ pub trait Multisig {
353353
function,
354354
arguments,
355355
} => {
356-
let mut call_data = CallDataSerializer::new(function.as_slice());
356+
let mut call_data = HexCallDataSerializer::new(function.as_slice());
357357
for arg in arguments {
358358
call_data.push_argument_bytes(arg.as_slice());
359359
}

‎elrond-wasm-debug/src/async_data.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::display_util::*;
22
use crate::ext_mock::*;
3-
use elrond_wasm::call_data::*;
43
use elrond_wasm::elrond_codec::*;
4+
use elrond_wasm::hex_call_data::HexCallDataDeserializer;
55
use elrond_wasm::{Address, H256};
66

77
use num_bigint::{BigInt, BigUint};
@@ -20,7 +20,7 @@ pub struct AsyncCallTxData {
2020
}
2121

2222
pub fn async_call_tx_input(async_data: &AsyncCallTxData, contract_addr: &Address) -> TxInput {
23-
let mut de = CallDataDeserializer::new(async_data.call_data.as_slice());
23+
let mut de = HexCallDataDeserializer::new(async_data.call_data.as_slice());
2424
let func_name = de.get_func_name().to_vec();
2525
let mut args: Vec<Vec<u8>> = Vec::new();
2626
let mut esdt_token_name = Vec::<u8>::new();

‎elrond-wasm-derive/src/callable_gen.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ impl Callable {
133133
let cb_name_str = &callback_ident.arg.to_string();
134134
let cb_name_literal = array_literal(cb_name_str.as_bytes());
135135
let callback_init = quote! {
136-
let mut callback_data_ser = elrond_wasm::call_data::CallDataSerializer::new( & #cb_name_literal );
136+
let mut callback_data_ser = elrond_wasm::hex_call_data::HexCallDataSerializer::new( & #cb_name_literal );
137137
};
138138
let callback_store = quote! {
139139
self.api.storage_store_slice_u8(&self.api.get_tx_hash().as_ref(), callback_data_ser.as_slice());
@@ -146,7 +146,7 @@ impl Callable {
146146
let m_name_literal = array_literal(m.name.to_string().as_bytes());
147147
let sig = quote! {
148148
#msig {
149-
let mut call_data_ser = elrond_wasm::call_data::CallDataSerializer::new( & #m_name_literal );
149+
let mut call_data_ser = elrond_wasm::hex_call_data::HexCallDataSerializer::new( & #m_name_literal );
150150
#callback_init
151151
#(#arg_push_snippets)*
152152
#callback_store

‎elrond-wasm-derive/src/contract_gen_callback.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ fn generate_callback_body_regular(methods: &[Method]) -> proc_macro2::TokenStrea
9292
} else {
9393
quote! {
9494
let cb_data_raw = self.api.storage_load_vec_u8(&self.api.get_tx_hash().as_ref());
95-
let mut cb_data_deserializer = elrond_wasm::call_data::CallDataDeserializer::new(cb_data_raw.as_slice());
95+
let mut cb_data_deserializer = elrond_wasm::hex_call_data::HexCallDataDeserializer::new(cb_data_raw.as_slice());
9696
let mut ___arg_loader = EndpointDynArgLoader::new(self.api.clone());
9797

9898
match cb_data_deserializer.get_func_name() {

‎elrond-wasm/src/call_data/mod.rs‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

elrond-wasm/src/call_data/cd_de.rs renamed to elrond-wasm/src/hex_call_data/cd_de.rs

Lines changed: 14 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ fn hex_to_byte(digit1: u8, digit2: u8) -> Option<u8> {
4141
/// Arguments can be empty.
4242
/// Argument hex encodings must always have an even number of digits.
4343
///
44-
/// CallDataDeserializer borrows its input and will allocate new Vecs for each output.
44+
/// HexCallDataDeserializer borrows its input and will allocate new Vecs for each output.
4545
///
4646
/// Converting from bytes to specific argument types is not in scope. Use the `serializer` module for that.
4747
///
48-
pub struct CallDataDeserializer<'a> {
48+
pub struct HexCallDataDeserializer<'a> {
4949
source: &'a [u8],
5050
index: usize,
5151
func_name_output: &'a [u8],
5252
}
5353

54-
impl<'a> CallDataDeserializer<'a> {
54+
impl<'a> HexCallDataDeserializer<'a> {
5555
pub fn new(source: &'a [u8]) -> Self {
56-
let mut de = CallDataDeserializer {
56+
let mut de = HexCallDataDeserializer {
5757
source,
5858
index: 0,
5959
func_name_output: &[],
@@ -136,7 +136,7 @@ mod tests {
136136
#[test]
137137
fn test_next_raw_bytes_1() {
138138
let input: &[u8] = b"func@1111@2222";
139-
let mut de = CallDataDeserializer::new(input);
139+
let mut de = HexCallDataDeserializer::new(input);
140140
assert_eq!(de.get_func_name(), &b"func"[..]);
141141
assert_eq!(de.next_argument_hex(), Some(&b"1111"[..]));
142142
assert_eq!(de.next_argument(), Ok(Some([0x22, 0x22].to_vec())));
@@ -146,15 +146,15 @@ mod tests {
146146

147147
#[test]
148148
fn test_next_raw_bytes_empty() {
149-
let mut de = CallDataDeserializer::new(&[]);
149+
let mut de = HexCallDataDeserializer::new(&[]);
150150
assert_eq!(de.get_func_name(), &[][..]);
151151
assert_eq!(de.next_argument(), Ok(None));
152152
}
153153

154154
#[test]
155155
fn test_next_raw_bytes_only_func() {
156156
let input: &[u8] = b"func";
157-
let mut de = CallDataDeserializer::new(input);
157+
let mut de = HexCallDataDeserializer::new(input);
158158

159159
assert_eq!(de.get_func_name(), &b"func"[..]);
160160
assert_eq!(de.next_argument(), Ok(None));
@@ -164,7 +164,7 @@ mod tests {
164164
#[test]
165165
fn test_next_raw_bytes_some_empty() {
166166
let input: &[u8] = b"func@@2222";
167-
let mut de = CallDataDeserializer::new(input);
167+
let mut de = HexCallDataDeserializer::new(input);
168168
assert_eq!(de.next_argument(), Ok(Some(Vec::new())));
169169
assert_eq!(de.next_argument(), Ok(Some([0x22, 0x22].to_vec())));
170170
assert_eq!(de.next_argument(), Ok(None));
@@ -176,7 +176,7 @@ mod tests {
176176
#[test]
177177
fn test_next_raw_bytes_ends_empty() {
178178
let input: &[u8] = b"func@";
179-
let mut de = CallDataDeserializer::new(input);
179+
let mut de = HexCallDataDeserializer::new(input);
180180
assert_eq!(de.get_func_name(), &b"func"[..]);
181181
assert_eq!(de.next_argument(), Ok(Some(Vec::new())));
182182
assert_eq!(de.next_argument(), Ok(None));
@@ -186,7 +186,7 @@ mod tests {
186186
#[test]
187187
fn test_next_raw_bytes_many_empty() {
188188
let input: &[u8] = b"func@@2222@@";
189-
let mut de = CallDataDeserializer::new(input);
189+
let mut de = HexCallDataDeserializer::new(input);
190190
assert_eq!(de.get_func_name(), &b"func"[..]);
191191
assert_eq!(de.next_argument(), Ok(Some(Vec::new())));
192192
assert_eq!(de.next_argument(), Ok(Some([0x22, 0x22].to_vec())));
@@ -199,7 +199,7 @@ mod tests {
199199
#[test]
200200
fn test_next_raw_bytes_all_empty() {
201201
let input: &[u8] = b"@@@";
202-
let mut de = CallDataDeserializer::new(input);
202+
let mut de = HexCallDataDeserializer::new(input);
203203
assert_eq!(de.get_func_name(), &[][..]);
204204
assert_eq!(de.next_argument(), Ok(Some(Vec::new())));
205205
assert_eq!(de.next_argument(), Ok(Some(Vec::new())));
@@ -211,7 +211,7 @@ mod tests {
211211
#[test]
212212
fn test_next_raw_bytes_all_empty_but_last() {
213213
let input: &[u8] = b"@@@1234";
214-
let mut de = CallDataDeserializer::new(input);
214+
let mut de = HexCallDataDeserializer::new(input);
215215
assert_eq!(de.get_func_name(), &[][..]);
216216
assert_eq!(de.next_argument(), Ok(Some(Vec::new())));
217217
assert_eq!(de.next_argument(), Ok(Some(Vec::new())));
@@ -223,7 +223,7 @@ mod tests {
223223
#[test]
224224
fn test_next_argument_large() {
225225
let input: &[u8] = b"func@0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
226-
let mut de = CallDataDeserializer::new(input);
226+
let mut de = HexCallDataDeserializer::new(input);
227227
let expected: [u8; 32] = [
228228
0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab,
229229
0xcd, 0xef, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67,
@@ -238,7 +238,7 @@ mod tests {
238238
#[test]
239239
fn test_next_vec_odd() {
240240
let input: &[u8] = b"func@123";
241-
let mut de = CallDataDeserializer::new(input);
241+
let mut de = HexCallDataDeserializer::new(input);
242242
assert_eq!(de.get_func_name(), &b"func"[..]);
243243
assert_eq!(
244244
de.next_argument(),
@@ -247,84 +247,4 @@ mod tests {
247247
assert_eq!(de.next_argument(), Ok(None));
248248
assert_eq!(de.next_argument(), Ok(None));
249249
}
250-
251-
// #[test]
252-
// fn test_next_u64_1() {
253-
// let cd = CallDataSerializer::from_raw_data((&b"func@5").to_vec());
254-
// let mut de = cd.deserializer();
255-
// assert_eq!(de.get_func_name(), &b"func"[..]);
256-
// assert_eq!(de.next_u64(), Some(0x05));
257-
// assert_eq!(de.next_u64(), None);
258-
// assert_eq!(de.next_u64(), None);
259-
// }
260-
261-
// #[test]
262-
// fn test_next_u64_2() {
263-
// let cd = CallDataSerializer::from_raw_data((&b"func@05").to_vec());
264-
// let mut de = cd.deserializer();
265-
// assert_eq!(de.get_func_name(), &b"func"[..]);
266-
// assert_eq!(de.next_u64(), Some(0x05));
267-
// assert_eq!(de.next_u64(), None);
268-
// assert_eq!(de.next_u64(), None);
269-
// }
270-
271-
// #[test]
272-
// fn test_next_u64_3() {
273-
// let cd = CallDataSerializer::from_raw_data((&b"func@e105").to_vec());
274-
// let mut de = cd.deserializer();
275-
// assert_eq!(de.get_func_name(), &b"func"[..]);
276-
// assert_eq!(de.next_u64(), Some(0xe105));
277-
// assert_eq!(de.next_u64(), None);
278-
// assert_eq!(de.next_u64(), None);
279-
// }
280-
281-
// #[test]
282-
// fn test_next_u64_4() {
283-
// let cd = CallDataSerializer::from_raw_data((&b"func@1234567890abcdef").to_vec());
284-
// let mut de = cd.deserializer();
285-
// assert_eq!(de.get_func_name(), &b"func"[..]);
286-
// assert_eq!(de.next_u64(), Some(0x1234567890abcdef));
287-
// assert_eq!(de.next_u64(), None);
288-
// assert_eq!(de.next_u64(), None);
289-
// }
290-
291-
// #[test]
292-
// fn test_next_u64_too_long() {
293-
// let cd = CallDataSerializer::from_raw_data((&b"func@010000000000000000").to_vec());
294-
// let mut de = cd.deserializer();
295-
// assert_eq!(de.get_func_name(), &b"func"[..]);
296-
// assert_eq!(de.next_u64(), Err(err_msg::DESERIALIZATION_ARG_OUT_OF_RANGE));
297-
// assert_eq!(de.next_u64(), None);
298-
// assert_eq!(de.next_u64(), None);
299-
// }
300-
301-
// #[test]
302-
// fn test_next_i64_1() {
303-
// let cd = CallDataSerializer::from_raw_data((&b"func@ffffffffffffffff").to_vec());
304-
// let mut de = cd.deserializer();
305-
// assert_eq!(de.get_func_name(), &b"func"[..]);
306-
// assert_eq!(de.next_i64(), Some(-1));
307-
// assert_eq!(de.next_i64(), None);
308-
// assert_eq!(de.next_i64(), None);
309-
// }
310-
311-
// #[test]
312-
// fn test_next_u32_1() {
313-
// let cd = CallDataSerializer::from_raw_data((&b"func@e105").to_vec());
314-
// let mut de = cd.deserializer();
315-
// assert_eq!(de.get_func_name(), &b"func"[..]);
316-
// assert_eq!(de.next_u32(), Some(0xe105));
317-
// assert_eq!(de.next_u32(), None);
318-
// assert_eq!(de.next_u32(), None);
319-
// }
320-
321-
// #[test]
322-
// fn test_next_u32_too_long() {
323-
// let cd = CallDataSerializer::from_raw_data((&b"func@0100000000").to_vec());
324-
// let mut de = cd.deserializer();
325-
// assert_eq!(de.get_func_name(), &b"func"[..]);
326-
// assert_eq!(de.next_u32(), Err(err_msg::DESERIALIZATION_ARG_OUT_OF_RANGE));
327-
// assert_eq!(de.next_u32(), None);
328-
// assert_eq!(de.next_u32(), None);
329-
// }
330250
}

0 commit comments

Comments
 (0)