1 files changed, 20 insertions, 25 deletions
diff --git a/src/fs/test_plugin_block_fs.c b/src/fs/test_plugin_block_fs.c
index 4f71c5d74..727cc37c2 100644
--- a/src/fs/test_plugin_block_fs.c
+++ b/src/fs/test_plugin_block_fs.c
@@ -34,36 +34,31 @@ test_fs (struct GNUNET_BLOCK_Context *ctx)
  memset (block, 1, sizeof(block));
  if (GNUNET_OK !=
-      GNUNET_BLOCK_get_key (ctx, GNUNET_BLOCK_TYPE_FS_DBLOCK, block,
+      GNUNET_BLOCK_get_key (ctx,
-                            sizeof(block), &key))
+                            GNUNET_BLOCK_TYPE_FS_DBLOCK,
+                            block,
+                            sizeof(block),
+                            &key))
    return 1;
-  if (GNUNET_BLOCK_EVALUATION_OK_LAST !=
+  if (GNUNET_OK !=
-      GNUNET_BLOCK_evaluate (ctx,
+      GNUNET_BLOCK_check_block (ctx,
-                             GNUNET_BLOCK_TYPE_FS_DBLOCK,
+                                GNUNET_BLOCK_TYPE_FS_DBLOCK,
-                             NULL,
+                                &key,
-                             GNUNET_BLOCK_EO_NONE,
+                                block,
-                             &key,
+                                sizeof(block)))
-                             NULL, 0,
-                             block, sizeof(block)))
    return 2;
-  if (GNUNET_BLOCK_EVALUATION_REQUEST_VALID !=
+  if (GNUNET_OK !=
-      GNUNET_BLOCK_evaluate (ctx,
+      GNUNET_BLOCK_check_query (ctx,
-                             GNUNET_BLOCK_TYPE_FS_DBLOCK,
+                                GNUNET_BLOCK_TYPE_FS_DBLOCK,
-                             NULL,
+                                &key,
-                             GNUNET_BLOCK_EO_NONE,
+                                NULL, 0))
-                             &key,
-                             NULL, 0,
-                             NULL, 0))
    return 4;
  GNUNET_log_skip (1, GNUNET_NO);
  if (GNUNET_BLOCK_EVALUATION_REQUEST_INVALID !=
-      GNUNET_BLOCK_evaluate (ctx,
+      GNUNET_BLOCK_check_query (ctx,
-                             GNUNET_BLOCK_TYPE_FS_DBLOCK,
+                                GNUNET_BLOCK_TYPE_FS_DBLOCK,
-                             NULL,
+                                &key,
-                             GNUNET_BLOCK_EO_NONE,
+                                "bogus", 5))
-                             &key,
-                             "bogus", 5,
-                             NULL, 0))
    return 8;
  GNUNET_log_skip (0, GNUNET_YES);
  return 0;

diff --git a/src/fs/test_plugin_block_fs.c b/src/fs/test_plugin_block_fs.c index 4f71c5d74..727cc37c2 100644 --- a/src/fs/test_plugin_block_fs.c +++ b/src/fs/test_plugin_block_fs.c
@@ -34,36 +34,31 @@ test_fs (struct GNUNET_BLOCK_Context *ctx)
34		34
35	memset (block, 1, sizeof(block));	35	memset (block, 1, sizeof(block));
36	if (GNUNET_OK !=	36	if (GNUNET_OK !=
37	GNUNET_BLOCK_get_key (ctx, GNUNET_BLOCK_TYPE_FS_DBLOCK, block,	37	GNUNET_BLOCK_get_key (ctx,
38	sizeof(block), &key))	38	GNUNET_BLOCK_TYPE_FS_DBLOCK,
		39	block,
		40	sizeof(block),
		41	&key))
39	return 1;	42	return 1;
40	if (GNUNET_BLOCK_EVALUATION_OK_LAST !=	43	if (GNUNET_OK !=
41	GNUNET_BLOCK_evaluate (ctx,	44	GNUNET_BLOCK_check_block (ctx,
42	GNUNET_BLOCK_TYPE_FS_DBLOCK,	45	GNUNET_BLOCK_TYPE_FS_DBLOCK,
43	NULL,	46	&key,
44	GNUNET_BLOCK_EO_NONE,	47	block,
45	&key,	48	sizeof(block)))
46	NULL, 0,
47	block, sizeof(block)))
48	return 2;	49	return 2;
49	if (GNUNET_BLOCK_EVALUATION_REQUEST_VALID !=	50	if (GNUNET_OK !=
50	GNUNET_BLOCK_evaluate (ctx,	51	GNUNET_BLOCK_check_query (ctx,
51	GNUNET_BLOCK_TYPE_FS_DBLOCK,	52	GNUNET_BLOCK_TYPE_FS_DBLOCK,
52	NULL,	53	&key,
53	GNUNET_BLOCK_EO_NONE,	54	NULL, 0))
54	&key,
55	NULL, 0,
56	NULL, 0))
57	return 4;	55	return 4;
58	GNUNET_log_skip (1, GNUNET_NO);	56	GNUNET_log_skip (1, GNUNET_NO);
59	if (GNUNET_BLOCK_EVALUATION_REQUEST_INVALID !=	57	if (GNUNET_BLOCK_EVALUATION_REQUEST_INVALID !=
60	GNUNET_BLOCK_evaluate (ctx,	58	GNUNET_BLOCK_check_query (ctx,
61	GNUNET_BLOCK_TYPE_FS_DBLOCK,	59	GNUNET_BLOCK_TYPE_FS_DBLOCK,
62	NULL,	60	&key,
63	GNUNET_BLOCK_EO_NONE,	61	"bogus", 5))
64	&key,
65	"bogus", 5,
66	NULL, 0))
67	return 8;	62	return 8;
68	GNUNET_log_skip (0, GNUNET_YES);	63	GNUNET_log_skip (0, GNUNET_YES);
69	return 0;	64	return 0;