diff --git a/hive/indexer/follow.py b/hive/indexer/follow.py index d6aa3729d7e35febe66dcd77c7e8e7d35908e75f..1dcc90cf6ab82e38770b39095d1eabb11866f096 100644 --- a/hive/indexer/follow.py +++ b/hive/indexer/follow.py @@ -361,7 +361,7 @@ class Follow(DbAdapterHolder): UPDATE hive_follows hf SET - hf.follow_blacklists = true + follow_blacklists = true FROM ( SELECT diff --git a/mock_data/block_data/follow_op/mock_block_data_follow.json b/mock_data/block_data/follow_op/mock_block_data_follow.json index 8c967e4d74afd1501494693d69ad09179d4c0a71..b68ceb415edbc96155a9d259cc72a4f7bfd90cf4 100644 --- a/mock_data/block_data/follow_op/mock_block_data_follow.json +++ b/mock_data/block_data/follow_op/mock_block_data_follow.json @@ -380,7 +380,26 @@ "transaction_merkle_root": "0000000000000000000000000000000000000000", "extensions": [], "witness_signature": "", - "transactions": [], + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"ignore\"]}]" + } + } + ] + } + ], "block_id": "004c4b4200000000000000000000000000000000", "signing_key": "", "transaction_ids": [] @@ -392,7 +411,26 @@ "transaction_merkle_root": "0000000000000000000000000000000000000000", "extensions": [], "witness_signature": "", - "transactions": [], + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"blacklist\"]}]" + } + } + ] + } + ], "block_id": "004c4b4300000000000000000000000000000000", "signing_key": "", "transaction_ids": [] @@ -404,7 +442,26 @@ "transaction_merkle_root": "0000000000000000000000000000000000000000", "extensions": [], "witness_signature": "", - "transactions": [], + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"follow_blacklist\"]}]" + } + } + ] + } + ], "block_id": "004c4b4400000000000000000000000000000000", "signing_key": "", "transaction_ids": [] @@ -416,7 +473,26 @@ "transaction_merkle_root": "0000000000000000000000000000000000000000", "extensions": [], "witness_signature": "", - "transactions": [], + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"unblacklist\"]}]" + } + } + ] + } + ], "block_id": "004c4b4500000000000000000000000000000000", "signing_key": "", "transaction_ids": [] @@ -428,9 +504,293 @@ "transaction_merkle_root": "0000000000000000000000000000000000000000", "extensions": [], "witness_signature": "", - "transactions": [], + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"unfollow_blacklist\"]}]" + } + } + ] + } + ], "block_id": "004c4b4600000000000000000000000000000000", "signing_key": "", "transaction_ids": [] + }, + "5000007": { + "previous": "004c4b4600000000000000000000000000000000", + "timestamp": "2016-09-15T19:47:39", + "witness": "initminer", + "transaction_merkle_root": "0000000000000000000000000000000000000000", + "extensions": [], + "witness_signature": "", + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"follow_muted\"]}]" + } + } + ] + } + ], + "block_id": "004c4b4700000000000000000000000000000000", + "signing_key": "", + "transaction_ids": [] + }, + "5000008": { + "previous": "004c4b4700000000000000000000000000000000", + "timestamp": "2016-09-15T19:47:39", + "witness": "initminer", + "transaction_merkle_root": "0000000000000000000000000000000000000000", + "extensions": [], + "witness_signature": "", + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"unfollow_muted\"]}]" + } + } + ] + } + ], + "block_id": "004c4b4800000000000000000000000000000000", + "signing_key": "", + "transaction_ids": [] + }, + "5000009": { + "previous": "004c4b4800000000000000000000000000000000", + "timestamp": "2016-09-15T19:47:39", + "witness": "initminer", + "transaction_merkle_root": "0000000000000000000000000000000000000000", + "extensions": [], + "witness_signature": "", + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"reset_blacklist\"]}]" + } + } + ] + } + ], + "block_id": "004c4b4900000000000000000000000000000000", + "signing_key": "", + "transaction_ids": [] + }, + "5000010": { + "previous": "004c4b4900000000000000000000000000000000", + "timestamp": "2016-09-15T19:47:39", + "witness": "initminer", + "transaction_merkle_root": "0000000000000000000000000000000000000000", + "extensions": [], + "witness_signature": "", + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"reset_following_list\"]}]" + } + } + ] + } + ], + "block_id": "004c4b4a00000000000000000000000000000000", + "signing_key": "", + "transaction_ids": [] + }, + "5000011": { + "previous": "004c4b4a00000000000000000000000000000000", + "timestamp": "2016-09-15T19:47:39", + "witness": "initminer", + "transaction_merkle_root": "0000000000000000000000000000000000000000", + "extensions": [], + "witness_signature": "", + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"reset_follow_blacklist\"]}]" + } + } + ] + } + ], + "block_id": "004c4b4b00000000000000000000000000000000", + "signing_key": "", + "transaction_ids": [] + }, + "5000012": { + "previous": "004c4b4b00000000000000000000000000000000", + "timestamp": "2016-09-15T19:47:39", + "witness": "initminer", + "transaction_merkle_root": "0000000000000000000000000000000000000000", + "extensions": [], + "witness_signature": "", + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"reset_follow_muted_list\"]}]" + } + } + ] + } + ], + "block_id": "004c4b4c00000000000000000000000000000000", + "signing_key": "", + "transaction_ids": [] + }, + "5000013": { + "previous": "004c4b4c00000000000000000000000000000000", + "timestamp": "2016-09-15T19:47:39", + "witness": "initminer", + "transaction_merkle_root": "0000000000000000000000000000000000000000", + "extensions": [], + "witness_signature": "", + "transactions": [ + { + "ref_block_num": 100001, + "ref_block_prefix": 1, + "expiration": "2020-03-23T12:17:00", + "operations": [ + { + "type": "custom_json_operation", + "value": { + "required_auths": [], + "required_posting_auths": [ + "tester1" + ], + "id": "follow", + "json": "[\"follow\",{\"follower\":\"tester1\",\"following\":\"tester2\",\"what\":[\"reset_all_lists\"]}]" + } + } + ] + } + ], + "block_id": "004c4b4d00000000000000000000000000000000", + "signing_key": "", + "transaction_ids": [] + }, + "5000014": { + "previous": "004c4b4d00000000000000000000000000000000", + "timestamp": "2016-09-15T19:47:39", + "witness": "initminer", + "transaction_merkle_root": "0000000000000000000000000000000000000000", + "extensions": [], + "witness_signature": "", + "transactions": [], + "block_id": "004c4b4e00000000000000000000000000000000", + "signing_key": "", + "transaction_ids": [] + }, + "5000015": { + "previous": "004c4b4e00000000000000000000000000000000", + "timestamp": "2016-09-15T19:47:39", + "witness": "initminer", + "transaction_merkle_root": "0000000000000000000000000000000000000000", + "extensions": [], + "witness_signature": "", + "transactions": [], + "block_id": "004c4b4f00000000000000000000000000000000", + "signing_key": "", + "transaction_ids": [] + }, + "5000016": { + "previous": "004c4b4f00000000000000000000000000000000", + "timestamp": "2016-09-15T19:47:39", + "witness": "initminer", + "transaction_merkle_root": "0000000000000000000000000000000000000000", + "extensions": [], + "witness_signature": "", + "transactions": [], + "block_id": "004c4b5000000000000000000000000000000000", + "signing_key": "", + "transaction_ids": [] + }, + "5000017": { + "previous": "004c4b5000000000000000000000000000000000", + "timestamp": "2016-09-15T19:47:39", + "witness": "initminer", + "transaction_merkle_root": "0000000000000000000000000000000000000000", + "extensions": [], + "witness_signature": "", + "transactions": [], + "block_id": "004c4b5100000000000000000000000000000000", + "signing_key": "", + "transaction_ids": [] } } \ No newline at end of file diff --git a/tests/tests_api b/tests/tests_api index c3c830a24079e47e59ebdd91a9670c905d6edfff..8aac0997c0ad0ea62d8d3fe2a38e5f0d24951380 160000 --- a/tests/tests_api +++ b/tests/tests_api @@ -1 +1 @@ -Subproject commit c3c830a24079e47e59ebdd91a9670c905d6edfff +Subproject commit 8aac0997c0ad0ea62d8d3fe2a38e5f0d24951380