diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/json/json.c | 23 | ||||
| -rw-r--r-- | src/json/test_json.c | 8 |
2 files changed, 18 insertions, 13 deletions
diff --git a/src/json/json.c b/src/json/json.c index c480d1b2..a730e1e4 100644 --- a/src/json/json.c +++ b/src/json/json.c @@ -180,9 +180,9 @@ forget (const json_t *in) json_t *rx; fg = json_object_get (in, - "_forgettable"); + "$forgettable"); rx = json_object_get (in, - "_forgotten"); + "$forgotten"); if (NULL != rx) rx = json_deep_copy (rx); /* should be shallow by structure, but @@ -292,7 +292,7 @@ forget (const json_t *in) if ( (NULL != rx) && (0 != json_object_set_new (ret, - "_forgotten", + "$forgotten", rx)) ) { GNUNET_break (0); @@ -321,6 +321,11 @@ TALER_JSON_contract_hash (const json_t *json, GNUNET_break (0); return GNUNET_SYSERR; } + + char *enc = json_dumps (cjson, + JSON_ENCODE_ANY + | JSON_COMPACT + | JSON_SORT_KEYS); ret = dump_and_hash (cjson, NULL, hc); @@ -365,13 +370,13 @@ TALER_JSON_contract_mark_forgettable (json_t *json, return GNUNET_SYSERR; } fg = json_object_get (json, - "_forgettable"); + "$forgettable"); if (NULL == fg) { fg = json_object (); if (0 != json_object_set_new (json, - "_forgettable", + "$forgettable", fg)) { GNUNET_break (0); @@ -419,22 +424,22 @@ TALER_JSON_contract_part_forget (json_t *json, return GNUNET_SYSERR; } fg = json_object_get (json, - "_forgettable"); + "$forgettable"); if (NULL == fg) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Did not find _forgettable attribute trying to forget field `%s'\n", + "Did not find '$forgettable' attribute trying to forget field `%s'\n", field); return GNUNET_SYSERR; } rx = json_object_get (json, - "_forgotten"); + "$forgotten"); if (NULL == rx) { rx = json_object (); if (0 != json_object_set_new (json, - "_forgotten", + "$forgotten", rx)) { GNUNET_break (0); diff --git a/src/json/test_json.c b/src/json/test_json.c index 4267efe1..b3c36837 100644 --- a/src/json/test_json.c +++ b/src/json/test_json.c @@ -99,7 +99,7 @@ test_contract (void) c1 = json_pack ("{s:s, s:{s:s, s:{s:s}}}", "k1", "v1", "k2", "n1", "n2", - /***/ "_forgettable", "n1", "salt"); + /***/ "$forgettable", "n1", "salt"); GNUNET_assert (NULL != c1); GNUNET_assert (GNUNET_OK == TALER_JSON_contract_mark_forgettable (c1, @@ -116,7 +116,7 @@ test_contract (void) /* check salt was forgotten */ GNUNET_assert (NULL == json_object_get (json_object_get (c1, - "_forgettable"), + "$forgettable"), "k1")); GNUNET_assert (GNUNET_OK == TALER_JSON_contract_hash (c1, @@ -162,9 +162,9 @@ test_contract (void) c1 = json_pack ("{s:I, s:{s:s}, s:{s:b, s:{s:s}}, s:{s:s}}", "k1", 1, - "_forgettable", "k1", "SALT", + "$forgettable", "k1", "SALT", "k2", "n1", true, - /***/ "_forgettable", "n1", "salt", + /***/ "$forgettable", "n1", "salt", "k3", "n1", "string"); GNUNET_assert (GNUNET_OK == TALER_JSON_contract_hash (c1, |