Skip to content

Commit 95c3fba

Browse files
authored
Change Store.inclusion_list from List to Set (#4165)
1 parent 9277196 commit 95c3fba

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,16 @@ gen_all: $(GENERATOR_TARGETS)
243243

244244
# Detect errors in generators.
245245
detect_errors: $(TEST_VECTOR_DIR)
246-
@find $(TEST_VECTOR_DIR) -name "INCOMPLETE"
246+
@incomplete_files=$$(find $(TEST_VECTOR_DIR) -name "INCOMPLETE"); \
247+
if [ -n "$$incomplete_files" ]; then \
248+
echo "[ERROR] incomplete detected"; \
249+
exit 1; \
250+
fi
247251
@if [ -f $(GENERATOR_ERROR_LOG_FILE) ]; then \
248252
echo "[ERROR] $(GENERATOR_ERROR_LOG_FILE) file exists"; \
249-
else \
250-
echo "[PASSED] error log file does not exist"; \
253+
exit 1; \
251254
fi
255+
@echo "[PASSED] no errors detected"
252256

253257
# Generate KZG trusted setups for testing.
254258
kzg_setups: pyspec

specs/_features/eip7805/fork-choice.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Store(object):
5757
latest_messages: Dict[ValidatorIndex, LatestMessage] = field(default_factory=dict)
5858
unrealized_justifications: Dict[Root, Checkpoint] = field(default_factory=dict)
5959
# [New in EIP-7805]
60-
inclusion_lists: Dict[Tuple[Slot, Root], List[InclusionList]] = field(default_factory=dict)
60+
inclusion_lists: Dict[Tuple[Slot, Root], Set[InclusionList]] = field(default_factory=dict)
6161
inclusion_list_equivocators: Dict[Tuple[Slot, Root], Set[ValidatorIndex]] = field(default_factory=dict)
6262
unsatisfied_inclusion_list_blocks: Set[Root] = field(default_factory=Set)
6363
```
@@ -200,5 +200,5 @@ def on_inclusion_list(
200200
store.inclusion_list_equivocators[(message.slot, root)].add(validator_index)
201201
# This inclusion list is not an equivocation. Store it if prior to the view freeze deadline
202202
elif is_before_freeze_deadline:
203-
store.inclusion_lists[(message.slot, root)].append(message)
203+
store.inclusion_lists[(message.slot, root)].add(message)
204204
```

0 commit comments

Comments
 (0)