taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

implement forgettable contract terms core logic (#6365)

Browse Source
This commit is contained in:
Christian Grothoff 2020-07-16 14:30:14 +02:00
parent 5658c4c52b
commit c326a5bd9d
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 97 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/json/json.c
View File

@ -41,8 +41,11 @@ dump_and_hash (const json_t *json,
char *wire_enc; char *wire_enc;
size_t len; size_t len;
GNUNET_break (NULL != json);
if (NULL == (wire_enc = json_dumps (json, if (NULL == (wire_enc = json_dumps (json,
JSON_COMPACT | JSON_SORT_KEYS))) JSON_ENCODE_ANY
| JSON_COMPACT
| JSON_SORT_KEYS)))
{ {
GNUNET_break (0); GNUNET_break (0);
return GNUNET_SYSERR; return GNUNET_SYSERR;
@ -116,7 +119,7 @@ forget (const json_t *in)
} }
return ret; return ret;
} }
if (! json_is_object (in)) if (json_is_object (in))
{ {
json_t *ret; json_t *ret;
const char *key; const char *key;
@ -147,6 +150,23 @@ forget (const json_t *in)
continue; /* skip! */ continue; /* skip! */
if (rx == value) if (rx == value)
continue; /* skip! */ continue; /* skip! */
if ( (NULL != rx) &&
(NULL !=
json_object_get (rx,
key)) )
{
if (0 !=
json_object_set_new (ret,
key,
json_null ()))
{
GNUNET_break (0);
json_decref (ret);
json_decref (rx);
return NULL;
}
continue; /* already forgotten earlier */
}
t = forget (value); t = forget (value);
if (NULL == t) if (NULL == t)
{ {
@ -208,7 +228,6 @@ forget (const json_t *in)
json_decref (rx); json_decref (rx);
return NULL; return NULL;
} }
} }
else else
{ {
@ -225,10 +244,11 @@ forget (const json_t *in)
} }
} }
} /* json_object_foreach */ } /* json_object_foreach */
if (0 != if ( (NULL != rx) &&
json_object_set_new (ret, (0 !=
"_forgotten", json_object_set_new (ret,
rx)) "_forgotten",
rx)) )
{ {
GNUNET_break (0); GNUNET_break (0);
json_decref (ret); json_decref (ret);

70
src/json/test_json.c
View File

@ -56,6 +56,74 @@ test_amount (void)
} }
static int
test_contract ()
{
struct GNUNET_HashCode h1;
struct GNUNET_HashCode h2;
json_t *c1;
json_t *c2;
json_t *c3;
c1 = json_pack ("{s:s, s:{s:s, s:{s:s}}}",
"k1", "v1",
"k2", "n1", "n2",
/***/ "_forgettable", "n1", "salt");
GNUNET_assert (NULL != c1);
GNUNET_assert (GNUNET_OK ==
TALER_JSON_contract_mark_forgettable (c1,
"k1"));
GNUNET_assert (GNUNET_OK ==
TALER_JSON_contract_hash (c1,
&h1));
GNUNET_assert (GNUNET_OK ==
TALER_JSON_contract_part_forget (c1,
"k1"));
GNUNET_assert (GNUNET_OK ==
TALER_JSON_contract_hash (c1,
&h2));
json_decref (c1);
if (0 !=
GNUNET_memcmp (&h1,
&h2))
{
GNUNET_break (0);
return 1;
}
c2 = json_pack ("{s:s}",
"n1", "n2");
GNUNET_assert (NULL != c2);
GNUNET_assert (GNUNET_OK ==
TALER_JSON_contract_mark_forgettable (c2,
"n1"));
c3 = json_pack ("{s:s, s:o}",
"k1", "v1",
"k2", c2);
GNUNET_assert (NULL != c3);
GNUNET_assert (GNUNET_OK ==
TALER_JSON_contract_mark_forgettable (c3,
"k1"));
GNUNET_assert (GNUNET_OK ==
TALER_JSON_contract_hash (c3,
&h1));
GNUNET_assert (GNUNET_OK ==
TALER_JSON_contract_part_forget (c2,
"n1"));
GNUNET_assert (GNUNET_OK ==
TALER_JSON_contract_hash (c3,
&h2));
json_decref (c3);
if (0 !=
GNUNET_memcmp (&h1,
&h2))
{
GNUNET_break (0);
return 1;
}
return 0;
}
int int
main (int argc, main (int argc,
const char *const argv[]) const char *const argv[])
@ -67,6 +135,8 @@ main (int argc,
NULL); NULL);
if (0 != test_amount ()) if (0 != test_amount ())
return 1; return 1;
if (0 != test_contract ())
return 2;
return 0; return 0;
} }