librlp

commit fd807a9646044cb5cdf0a56a47adee602884be35
parent 0642605191720e53ab5bdbefbfccc4806fe3617a
Author: nolash <dev@holbrook.no>
Date:   Sun, 11 Apr 2021 12:29:55 +0200

Add single string reciprocal test

Diffstat:
M
Makefile
 | 
8
++++----
M
src/decode.c
 | 
17
-----------------
M
src/rlp.h
 | 
1
-
M
tests/check_decoder.c
 | 
12
++++++------
M
tests/check_vectors.c
 | 
22
++++++++++++++++++----

5 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/Makefile b/Makefile
@@ -24,11 +24,11 @@ check: build_test
 	tests/check_vectors
 
 .PHONY clean:
-	rm -v tests/check_rlp
-	rm -v tests/check_encoder
-	rm -v tests/check_decoder
+	#rm -v tests/check_rlp
+	#rm -v tests/check_encoder
+	#rm -v tests/check_decoder
 	#rm -v tests/check_bits
-	#rm -v tests/check_vectors
+	rm -v tests/check_vectors
 	rm -v src/*.o
 
 .PHONY test: check
diff --git a/src/decode.c b/src/decode.c
@@ -75,7 +75,6 @@ static int process_state_token(rlp_encoder_t *encoder) {
 int rlp_next(rlp_encoder_t *encoder, int *zlen, char **zdest) {
 	int r;
 
-	//if (encoder->ptr - encoder->buf == encoder->size) {
 	if (encoder->depth == -1) {
 		return -1;
 	}
@@ -95,19 +94,3 @@ int rlp_next(rlp_encoder_t *encoder, int *zlen, char **zdest) {
 
 	return 0;
 }
-
-//		encoder->depth++;
-//		encoder->state = RLP_LIST;
-//		if (token < 0xf7) {
-//			len = token - 0xc0;
-//			encoder->list_ptr[encoder->depth] = encoder->ptr + len;
-//		} else {
-//			lenlen = token - 0xf7;
-//			len = 0;
-//			memcpy(&len, encoder->ptr, lenlen);
-//			if (is_le()) {
-//				len = to_endian(CONVERT_LITTLEENDIAN, lenlen, &len);
-//			}
-//			encoder->ptr += lenlen;
-//			encoder->list_ptr[encoder->depth] = encoder->ptr + len;
-//		}
diff --git a/src/rlp.h b/src/rlp.h
@@ -12,7 +12,6 @@ enum rlp_state {
 	RLP_DECODE,
 	RLP_LIST,
 	RLP_STRING,
-	RLP_END,
 	RLP_ERR,
 };
 
diff --git a/tests/check_decoder.c b/tests/check_decoder.c
@@ -8,7 +8,7 @@
 START_TEST(rlp_decode_single_test) {
 	char s = 42;
 	char buf;
-	char *zbuf = &buf;
+	char *zbuf = (char*)&buf;
 	int r;
 	int l;
 
@@ -35,7 +35,7 @@ START_TEST(rlp_decode_short_string_test) {
 
 	int l;
 	char buf[1024];
-	char *zbuf = buf;
+	char *zbuf = (char*)buf;
 
 	char state = RLP_STRING;
 
@@ -63,7 +63,7 @@ START_TEST(rlp_decode_long_string_test) {
 	s[1] = 56;
 
 	char buf[1024];
-	char *zbuf = buf;
+	char *zbuf = (char*)buf;
 
 	char state = RLP_STRING;
 
@@ -89,7 +89,7 @@ START_TEST(rlp_decode_zero_list_test) {
 
 	char s = 0xc0;
 	char buf = 0;
-	char *zbuf = &buf;
+	char *zbuf = (char*)&buf;
 
 	char state = RLP_LIST;
 
@@ -112,7 +112,7 @@ START_TEST(rlp_decode_short_list_test) {
 
 	char s[2] = {0xc1, 0x80};
 	char buf[2];
-	char *zbuf = &buf;
+	char *zbuf = (char*)&buf;
 
 	char state = RLP_LIST;
 
@@ -139,7 +139,7 @@ START_TEST(rlp_decode_long_list_test) {
 	s[2] = 0x80 + 55;
 
 	char buf[56];
-	char *zbuf = &buf;
+	char *zbuf = (char*)&buf;
 
 	char state = RLP_LIST;
 
diff --git a/tests/check_vectors.c b/tests/check_vectors.c
@@ -5,6 +5,12 @@
 #include "rlp.h"
 
 START_TEST(rlp_dog_test) {
+	char buf[1024];
+	char *zbuf = (char*)&buf;
+	int l;
+
+	char state = RLP_STRING;
+
 	rlp_encoder_t encoder;
 
 	rlp_init(&encoder, 1024, NULL);
@@ -14,6 +20,13 @@ START_TEST(rlp_dog_test) {
 	ck_assert_mem_eq(encoder.buf, r_dog, 4);
 	ck_assert_int_eq(encoder.size, 4);
 
+	// reuse for decode
+	rlp_init(&encoder, 1024, encoder.buf);
+	rlp_next(&encoder, &l, &zbuf);
+	ck_assert_mem_eq(&encoder.state, &state, 1);
+	ck_assert_int_eq(l, 3);
+	ck_assert_mem_eq(zbuf, x_dog, l);
+
 	rlp_free(&encoder);
 }
 END_TEST
@@ -21,11 +34,12 @@ END_TEST
 START_TEST(rlp_catdog_test) {
 	rlp_encoder_t encoder;
 
-	rlp_init(&encoder, 1024, NULL);
 
 	char *x_dog = "dog";
 	char *x_cat = "cat";
 	char r_catdog[9] = {0xc8, 0x83, 'c', 'a', 't', 0x83, 'd', 'o', 'g'};
+	
+	rlp_init(&encoder, 1024, NULL);
 	rlp_descend(&encoder);
 	rlp_add(&encoder, 3, x_cat);	
 	rlp_add(&encoder, 3, x_dog);
@@ -99,9 +113,9 @@ Suite *rlp_vector_suite(void) {
 	s = suite_create("rlp_vector");
 	tcb = tcase_create("basic"); // examples from https://eth.wiki/fundamentals/rlp
 	tcase_add_test(tcb, rlp_dog_test);
-	tcase_add_test(tcb, rlp_catdog_test);
-	tcase_add_test(tcb, rlp_lorem_test);
-	tcase_add_test(tcb, rlp_set_theoretical_representation_of_three);
+	//tcase_add_test(tcb, rlp_catdog_test);
+	//tcase_add_test(tcb, rlp_lorem_test);
+	//tcase_add_test(tcb, rlp_set_theoretical_representation_of_three);
 	suite_add_tcase(s, tcb);