Skip to content

Commit 1a3c98d

Browse files
montylymontyly
committed
Merge branch 'dev' into dev-source-unit
Rename create_source_units -> create_source_unit
2 parents 7e47170 + 28ce1e7 commit 1a3c98d

26 files changed

+79
-64
lines changed

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

‎.github/workflows/black.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717

1818
steps:
1919
- name: Checkout Code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

2222
- name: Set up Python 3.8
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v4
2424
with:
2525
python-version: 3.8
2626

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
with:
5050
node-version: ${{ steps.node.outputs.version }}
5151
- name: Set up Python 3.8
52-
uses: actions/setup-python@v3
52+
uses: actions/setup-python@v4
5353
with:
5454
python-version: 3.8
5555
- name: Install dependencies
@@ -59,10 +59,10 @@ jobs:
5959
pip install .
6060
- name: Set up nix
6161
if: matrix.type == 'dapp'
62-
uses: cachix/install-nix-action@v16
62+
uses: cachix/install-nix-action@v18
6363
- name: Set up cachix
6464
if: matrix.type == 'dapp'
65-
uses: cachix/cachix-action@v10
65+
uses: cachix/cachix-action@v12
6666
with:
6767
name: dapp
6868
- name: Run Tests

‎.github/workflows/darglint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
tests:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v1
16+
- uses: actions/checkout@v3
1717
- name: Set up Python 3.8
18-
uses: actions/setup-python@v1
18+
uses: actions/setup-python@v4
1919
with:
2020
python-version: 3.8
2121
- name: Run Tests

‎.github/workflows/etherscan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo 'C:\msys64\mingw64\bin' >> "$GITHUB_PATH"
2828
echo 'C:\msys64\usr\bin' >> "$GITHUB_PATH"
2929
- name: Set up Python 3.8
30-
uses: actions/setup-python@v3
30+
uses: actions/setup-python@v4
3131
with:
3232
python-version: 3.8
3333
- name: Install dependencies

‎.github/workflows/linter.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717

1818
steps:
1919
- name: Checkout Code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

2222
- name: Set up Python 3.8
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v4
2424
with:
2525
python-version: 3.8
2626

‎.github/workflows/mypy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717

1818
steps:
1919
- name: Checkout Code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

2222
- name: Set up Python 3.8
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v4
2424
with:
2525
python-version: 3.8
2626

‎.github/workflows/pylint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717

1818
steps:
1919
- name: Checkout Code
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121

2222
- name: Set up Python 3.8
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v4
2424
with:
2525
python-version: 3.8
2626

‎crytic_compile/compilation_unit.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from collections import defaultdict
66
from typing import TYPE_CHECKING, Dict, Set
77

8+
89
from crytic_compile.compiler.compiler import CompilerVersion
910
from crytic_compile.source_unit import SourceUnit
1011
from crytic_compile.utils.naming import Filename
@@ -102,7 +103,7 @@ def asts(self) -> Dict[str, Dict]:
102103
for source_unit in self.source_units.values()
103104
}
104105

105-
def create_source_units(self, filename: Filename) -> SourceUnit:
106+
def create_source_unit(self, filename: Filename) -> SourceUnit:
106107
"""
107108
Create the source unit associated with the filename
108109
Add the relevant info in the compilation unit/crytic compile

‎crytic_compile/cryticparser/cryticparser.py‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,33 @@ def init(parser: ArgumentParser) -> None:
1616
parser (ArgumentParser): argparser where the cli flags are added
1717
"""
1818

19-
group_solc = parser.add_argument_group("Compile options")
19+
group_compile = parser.add_argument_group("Compile options")
2020

2121
platforms = get_platforms()
2222

23-
group_solc.add_argument(
23+
group_compile.add_argument(
2424
"--compile-force-framework",
2525
help="Force the compile to a given framework "
2626
f"({','.join([x.NAME.lower() for x in platforms])})",
2727
action="store",
2828
default=DEFAULTS_FLAG_IN_CONFIG["compile_force_framework"],
2929
)
3030

31-
group_solc.add_argument(
31+
group_compile.add_argument(
3232
"--compile-remove-metadata",
3333
help="Remove the metadata from the bytecodes",
3434
action="store_true",
3535
default=DEFAULTS_FLAG_IN_CONFIG["compile_remove_metadata"],
3636
)
3737

38-
group_solc.add_argument(
38+
group_compile.add_argument(
3939
"--compile-custom-build",
4040
help="Replace platform specific build command",
4141
action="store",
4242
default=DEFAULTS_FLAG_IN_CONFIG["compile_custom_build"],
4343
)
4444

45-
group_solc.add_argument(
45+
group_compile.add_argument(
4646
"--ignore-compile",
4747
help="Do not run compile of any platform",
4848
action="store_true",
@@ -53,13 +53,15 @@ def init(parser: ArgumentParser) -> None:
5353
_init_solc(parser)
5454
_init_truffle(parser)
5555
_init_embark(parser)
56+
_init_brownie(parser)
5657
_init_dapp(parser)
5758
_init_etherlime(parser)
5859
_init_etherscan(parser)
5960
_init_waffle(parser)
6061
_init_npx(parser)
6162
_init_buidler(parser)
6263
_init_hardhat(parser)
64+
_init_foundry(parser)
6365

6466

6567
def _init_solc(parser: ArgumentParser) -> None:
@@ -230,8 +232,8 @@ def _init_brownie(parser: ArgumentParser) -> None:
230232
Args:
231233
parser (ArgumentParser): argparser where the cli flags are added
232234
"""
233-
group_embark = parser.add_argument_group("Brownie options")
234-
group_embark.add_argument(
235+
group_brownie = parser.add_argument_group("Brownie options")
236+
group_brownie.add_argument(
235237
"--brownie-ignore-compile",
236238
help="Do not run brownie compile",
237239
action="store_true",
@@ -431,7 +433,7 @@ def _init_hardhat(parser: ArgumentParser) -> None:
431433
Args:
432434
parser (ArgumentParser): argparser where the cli flags are added
433435
"""
434-
group_hardhat = parser.add_argument_group("hardhat options")
436+
group_hardhat = parser.add_argument_group("Hardhat options")
435437
group_hardhat.add_argument(
436438
"--hardhat-ignore-compile",
437439
help="Do not run hardhat compile",
@@ -463,16 +465,16 @@ def _init_foundry(parser: ArgumentParser) -> None:
463465
Args:
464466
parser (ArgumentParser): argparser where the cli flags are added
465467
"""
466-
group_hardhat = parser.add_argument_group("foundry options")
467-
group_hardhat.add_argument(
468+
group_foundry = parser.add_argument_group("Foundry options")
469+
group_foundry.add_argument(
468470
"--foundry-ignore-compile",
469471
help="Do not run foundry compile",
470472
action="store_true",
471473
dest="foundry_ignore_compile",
472474
default=DEFAULTS_FLAG_IN_CONFIG["foundry_ignore_compile"],
473475
)
474476

475-
group_hardhat.add_argument(
477+
group_foundry.add_argument(
476478
"--foundry-out-directory",
477479
help="Use an alternative out directory (default: out)",
478480
action="store",

0 commit comments

Comments
 (0)