Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use package prefix to run unittests at the root dir #41

Merged
merged 3 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python 3.x
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
# Semantic version range syntax or exact version of a Python version
python-version: '3.x'
python-version: '3.11'
- name: Install dependencies
run: pip install -r requirements.txt
- name: Run tests
run: cd carnot && python -m unittest
run: python -m unittest
6 changes: 3 additions & 3 deletions carnot/beaconized_carnot.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Set

from carnot import Carnot, Block, TimeoutQc, Vote, Event, Send, Quorum
from beacon import *
from overlay import EntropyOverlay
from carnot.carnot import Carnot, Block, TimeoutQc, Vote, Event, Send, Quorum
from carnot.beacon import *
from carnot.overlay import EntropyOverlay

@dataclass
class BeaconizedBlock(Block):
Expand Down
2 changes: 1 addition & 1 deletion carnot/overlay.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import random
from abc import abstractmethod
from typing import Set, Optional, List, Self
from carnot import Overlay, Id, Committee, View
from carnot.carnot import Overlay, Id, Committee, View


class EntropyOverlay(Overlay):
Expand Down
2 changes: 1 addition & 1 deletion carnot/test_beacon_verification.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Tuple
from unittest import TestCase

from beacon import *
from carnot.beacon import *
from random import randint


Expand Down
10 changes: 5 additions & 5 deletions carnot/test_beaconized_carnot.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

from blspy import PrivateKey

from carnot import Id, Carnot, Block, Overlay, Vote, StandardQc, NewView
from beacon import generate_random_sk, RandomBeacon, NormalMode, RecoveryMode
from beaconized_carnot import BeaconizedCarnot, BeaconizedBlock
from overlay import FlatOverlay, EntropyOverlay
from test_unhappy_path import parents_from_childs
from carnot.carnot import Id, Carnot, Block, Overlay, Vote, StandardQc, NewView
from carnot.beacon import generate_random_sk, RandomBeacon, NormalMode, RecoveryMode
from carnot.beaconized_carnot import BeaconizedCarnot, BeaconizedBlock
from carnot.overlay import FlatOverlay, EntropyOverlay
from carnot.test_unhappy_path import parents_from_childs


def gen_node(sk: PrivateKey, overlay: Overlay, entropy: bytes = b""):
Expand Down
2 changes: 1 addition & 1 deletion carnot/test_happy_path.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from carnot import *
from carnot.carnot import *
from unittest import TestCase


Expand Down
2 changes: 1 addition & 1 deletion carnot/test_tree_overlay.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from unittest import TestCase

from tree_overlay import CarnotOverlay, CarnotTree
from carnot.tree_overlay import CarnotOverlay, CarnotTree


class TestCarnotTree(TestCase):
Expand Down
2 changes: 1 addition & 1 deletion carnot/test_unhappy_path.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from carnot import *
from carnot.carnot import *
from unittest import TestCase
from itertools import chain

Expand Down
4 changes: 2 additions & 2 deletions carnot/tree_overlay.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import itertools
from hashlib import blake2b
from typing import List, Dict, Tuple, Set, Optional, Self
from carnot import Id, Committee
from overlay import EntropyOverlay
from carnot.carnot import Id, Committee
from carnot.overlay import EntropyOverlay
import random


Expand Down