Skip to content

Commit

Permalink
Merge pull request #43 from crytic/dev-black
Browse files Browse the repository at this point in the history 
Run black
  • Loading branch information
@montyly
montyly authored Oct 2, 2019
2 parents bae0522 + 5c34937 commit 1fcd22f
Show file tree
Hide file tree
Showing 23 changed files with 1,358 additions and 957 deletions.
135 changes: 78 additions & 57 deletions crytic_compile/__main__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,53 +16,68 @@

def parse_args():
# Create our argument parser
parser = argparse.ArgumentParser(description='crytic-compile. For usage information, see https://github.com/crytic/crytic-compile/wiki/Usage',
usage="crytic-compile contract.sol [flag]")
parser = argparse.ArgumentParser(
description="crytic-compile. For usage information, see https://github.com/crytic/crytic-compile/wiki/Usage",
usage="crytic-compile contract.sol [flag]",
)

# Add arguments
parser.add_argument('target',
help='contract.sol')

parser.add_argument('--config-file',
help='Provide a config file (default: crytic.config.json)',
action='store',
dest='config_file',
default='crytic.config.json')

parser.add_argument('--export-format',
help='Export json with non crytic-compile format (default None. Accepted: standard, solc, truffle)',
action='store',
dest='export_format',
default=None)

parser.add_argument('--export-formats',
help='Comma-separated list of export format, defaults to None',
action='store',
dest='export_formats',
default=None)

parser.add_argument('--export-dir',
help='Export directory (default: crytic-export)',
action='store',
dest='export_dir',
default='crytic-export')

parser.add_argument('--export-zip',
help='Export all the projects to a zip file',
action='store',
dest='export_to_zip',
default=None)

parser.add_argument('--print-filenames',
help='Print all the filenames',
action='store_true',
dest='print_filename',
default=False)

parser.add_argument('--version',
help='displays the current version',
version=require('crytic-compile')[0].version,
action='version')
parser.add_argument("target", help="contract.sol")

parser.add_argument(
"--config-file",
help="Provide a config file (default: crytic.config.json)",
action="store",
dest="config_file",
default="crytic.config.json",
)

parser.add_argument(
"--export-format",
help="Export json with non crytic-compile format (default None. Accepted: standard, solc, truffle)",
action="store",
dest="export_format",
default=None,
)

parser.add_argument(
"--export-formats",
help="Comma-separated list of export format, defaults to None",
action="store",
dest="export_formats",
default=None,
)

parser.add_argument(
"--export-dir",
help="Export directory (default: crytic-export)",
action="store",
dest="export_dir",
default="crytic-export",
)

parser.add_argument(
"--export-zip",
help="Export all the projects to a zip file",
action="store",
dest="export_to_zip",
default=None,
)

parser.add_argument(
"--print-filenames",
help="Print all the filenames",
action="store_true",
dest="print_filename",
default=False,
)

parser.add_argument(
"--version",
help="displays the current version",
version=require("crytic-compile")[0].version,
action="version",
)

cryticparser.init(parser)
if len(sys.argv) == 1:
Expand All @@ -74,19 +89,28 @@ def parse_args():
# If there is a config file provided, update the values with the one in the config file
if os.path.isfile(args.config_file):
try:
with open(args.config_file, encoding='utf8') as f:
with open(args.config_file, encoding="utf8") as f:
config = json.load(f)
for key, elem in config.items():
if key not in defaults_flag_in_config:
logger.info('{} has an unknown key: {} : {}'.format(args.config_file, key, elem))
logger.info(
"{} has an unknown key: {} : {}".format(
args.config_file, key, elem
)
)
continue
if getattr(args, key) == defaults_flag_in_config[key]:
setattr(args, key, elem)
except json.decoder.JSONDecodeError as e:
logger.error('Impossible to read {}, please check the file {}'.format(args.config_file, e))
logger.error(
"Impossible to read {}, please check the file {}".format(
args.config_file, e
)
)

return args


def main():
args = parse_args()
try:
Expand All @@ -102,29 +126,26 @@ def main():
filename = compilation.filename_of_contract(contract)
unique_id = f"{contract} - {filename}"
if unique_id not in printed_filenames:
print(f'{contract} -> \n\tAbsolute: {filename.absolute}')
print(f'\tRelative: {filename.relative}')
print(f'\tShort: {filename.short}')
print(f'\tUsed: {filename.used}')
print(f"{contract} -> \n\tAbsolute: {filename.absolute}")
print(f"\tRelative: {filename.relative}")
print(f"\tShort: {filename.short}")
print(f"\tUsed: {filename.used}")
printed_filenames.add(unique_id)
if args.export_format:
compilation.export(**vars(args))

if args.export_formats:
for format in args.export_formats.split(','):
for format in args.export_formats.split(","):
args.export_format = format
compilation.export(**vars(args))

if args.export_to_zip:
save_to_zip(compilations, args.export_to_zip)



except InvalidCompilation as e:
logger.error(e)
sys.exit(-1)


if __name__ == '__main__':
if __name__ == "__main__":
main()

2 changes: 1 addition & 1 deletion crytic_compile/compiler/compiler.py
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from collections import namedtuple

CompilerVersion = namedtuple('CompilerVersion', ['compiler', 'version', 'optimized'])
CompilerVersion = namedtuple("CompilerVersion", ["compiler", "version", "optimized"])
Loading

0 comments on commit 1fcd22f

Please sign in to comment.