Navigation Menu

Skip to content

Commit

Permalink
Rename python module to Vyper.
Browse files Browse the repository at this point in the history
  • Loading branch information
jacqueswww committed Jan 12, 2018
1 parent 97f5257 commit 17c3e01
Show file tree
Hide file tree
Showing 96 changed files with 186 additions and 186 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -13,7 +13,7 @@ install:

script:
- python setup.py test
- flake8 viper/ tests/
- flake8 vyper/ tests/

after_success:
- coveralls
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -19,14 +19,14 @@ clean-pyc:
find . -name '*~' -exec rm -f {} +

docs:
rm -f docs/viper.rst
rm -f docs/vyper.rst
rm -f docs/modules.rst
sphinx-apidoc -o docs/ -d 2 viper/
sphinx-apidoc -o docs/ -d 2 vyper/
$(MAKE) -C docs clean
$(MAKE) -C docs html
open docs/_build/html/index.html

docker-build:
@docker build -t viper \
--build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` .
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` .
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/conf.py
Expand Up @@ -161,7 +161,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'viper', 'Viper Documentation',
(master_doc, 'vyper', 'Viper Documentation',
[author], 1)
]

Expand Down
2 changes: 1 addition & 1 deletion examples/safe_remote_purchase/safe_remote_purchase.v.py
@@ -1,7 +1,7 @@
#Safe Remote Purchase
#Originally from
#https://github.com/ethereum/solidity/blob/develop/docs/solidity-by-example.rst
#ported to viper and optimized
#ported to vyper and optimized

#Rundown of the transaction:
#1. Seller posts item for sale and posts safety deposit of double the item value.
Expand Down
2 changes: 1 addition & 1 deletion scripts/fixed_address_creator.py
Expand Up @@ -2,7 +2,7 @@
import rlp
from ethereum.slogging import LogRecorder, configure_logging, set_level
config_string = ':info,eth.vm.log:trace,eth.vm.op:trace,eth.vm.stack:trace,eth.vm.exit:trace,eth.pb.msg:trace,eth.pb.tx:debug'
from viper import optimizer, compile_lll
from vyper import optimizer, compile_lll
from rlp_decoder import rlp_decoder_bytes

def encode_vals(vals):
Expand Down
2 changes: 1 addition & 1 deletion scripts/forwarder.py
Expand Up @@ -27,7 +27,7 @@ def increment_moose(i: num) -> num:
def test():
from ethereum.tools import tester2
c = tester2.Chain()
x = c.contract(kode, language='viper', sender=tester2.k3)
x = c.contract(kode, language='vyper', sender=tester2.k3)
fwdcode = mk_forwarder(x.address)
initcode = mk_wrapper(fwdcode)
print('Forwarder code:', initcode)
Expand Down
6 changes: 3 additions & 3 deletions scripts/rlp_decoder.py
@@ -1,6 +1,6 @@
from viper import optimizer, compile_lll
from viper.parser.parser_utils import LLLnode
from viper.utils import MemoryPositions
from vyper import optimizer, compile_lll
from vyper.parser.parser_utils import LLLnode
from vyper.utils import MemoryPositions

def call_data_char(position):
return ['div', ['calldataload', position], 2**248]
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Expand Up @@ -13,13 +13,13 @@
version = '0.0.3'

setup(
name='viper',
name='vyper',
version=version,
description='Viper Programming Language for Ethereum',
long_description=readme,
author='Vitalik Buterin',
author_email='',
url='https://github.com/ethereum/viper',
url='https://github.com/ethereum/vyper',
license=license,
packages=find_packages(exclude=('tests', 'docs')),
install_requires=[
Expand All @@ -29,5 +29,5 @@
'pytest-runner', # Must be after pytest-cov or it will not work
# due to https://github.com/pypa/setuptools/issues/196
],
scripts=['bin/viper', 'bin/viper-serve']
scripts=['bin/vyper', 'bin/vyper-serve']
)
4 changes: 2 additions & 2 deletions snap/snapcraft.yaml
@@ -1,4 +1,4 @@
name: viper
name: vyper
version: git
summary: Experimental language for the Ethereum Virtual Machine
description: |
Expand All @@ -9,7 +9,7 @@ confinement: devmode # use 'strict' once you have the right plugs and slots

apps:
viper:
command: viper
command: vyper

parts:
viper:
Expand Down
2 changes: 1 addition & 1 deletion tests/compiler/test_bytecode_runtime.py
@@ -1,4 +1,4 @@
from viper import compiler
from vyper import compiler


def test_bytecode_runtime():
Expand Down
4 changes: 2 additions & 2 deletions tests/compiler/test_sha3_32.py
@@ -1,5 +1,5 @@
from viper.parser.parser_utils import LLLnode
from viper import compile_lll, optimizer
from vyper.parser.parser_utils import LLLnode
from vyper import compile_lll, optimizer


def test_sha3_32():
Expand Down
16 changes: 8 additions & 8 deletions tests/conftest.py
Expand Up @@ -2,10 +2,10 @@
from functools import wraps

from ethereum.tools import tester
from viper.parser.parser_utils import (
from vyper.parser.parser_utils import (
LLLnode
)
from viper import (
from vyper import (
compile_lll,
optimizer
)
Expand All @@ -16,9 +16,9 @@
def check_gas(chain):
def check_gas(code, func=None, num_txs=1):
if func:
gas_estimate = tester.languages['viper'].gas_estimate(code)[func]
gas_estimate = tester.languages['vyper'].gas_estimate(code)[func]
else:
gas_estimate = sum(tester.languages['viper'].gas_estimate(code).values())
gas_estimate = sum(tester.languages['vyper'].gas_estimate(code).values())
gas_actual = chain.head_state.receipts[-1].gas_used \
- chain.head_state.receipts[-1 - num_txs].gas_used \
- chain.last_tx.intrinsic_gas_used * num_txs
Expand Down Expand Up @@ -92,7 +92,7 @@ def get_contract_with_gas_estimation(chain):
def get_contract_with_gas_estimation(
source_code,
*args, **kwargs):
contract = chain.contract(source_code, language="viper", *args, **kwargs)
contract = chain.contract(source_code, language="vyper", *args, **kwargs)
for func_name in contract.translator.function_data:
set_decorator_to_contract_function(
chain, contract, source_code, func_name
Expand All @@ -107,12 +107,12 @@ def get_contract_with_gas_estimation_for_constants(chain):
def get_contract_with_gas_estimation_for_constants(
source_code,
*args, **kwargs):
abi = tester.languages['viper'].mk_full_signature(source_code)
abi = tester.languages['vyper'].mk_full_signature(source_code)
# Take out constants from the abi for the purpose of gas estimation
for func in abi:
func['constant'] = False
ct = tester.ContractTranslator(abi)
byte_code = tester.languages['viper'].compile(source_code) + (ct.encode_constructor_arguments(kwargs['args']) if kwargs else b'')
byte_code = tester.languages['vyper'].compile(source_code) + (ct.encode_constructor_arguments(kwargs['args']) if kwargs else b'')
address = chain.tx(to=b'', data=byte_code)
contract = tester.ABIContract(chain, abi, address)
for func_name in contract.translator.function_data:
Expand All @@ -126,7 +126,7 @@ def get_contract_with_gas_estimation_for_constants(
@pytest.fixture
def get_contract(chain):
def get_contract(source_code, *args, **kwargs):
return chain.contract(source_code, language="viper", *args, **kwargs)
return chain.contract(source_code, language="vyper", *args, **kwargs)
return get_contract


Expand Down
6 changes: 3 additions & 3 deletions tests/examples/auctions/test_simple_open_auction.py
Expand Up @@ -6,10 +6,10 @@

@pytest.fixture
def auction_tester(t):
from viper import compiler
t.languages['viper'] = compiler.Compiler()
from vyper import compiler
t.languages['vyper'] = compiler.Compiler()
contract_code = open('examples/auctions/simple_open_auction.v.py').read()
t.c = t.s.contract(contract_code, language='viper', args=[t.accounts[0], FIVE_DAYS])
t.c = t.s.contract(contract_code, language='vyper', args=[t.accounts[0], FIVE_DAYS])
return t


Expand Down
6 changes: 3 additions & 3 deletions tests/examples/company/test_company.py
Expand Up @@ -2,19 +2,19 @@

from ethereum.tools import tester as t

from viper import compiler
from vyper import compiler


@pytest.fixture
def tester():
tester = t
tester.s = t.Chain()
tester.s.head_state.gas_limit = 10**9
tester.languages['viper'] = compiler.Compiler()
tester.languages['vyper'] = compiler.Compiler()
contract_code = open('examples/stock/company.v.py').read()
tester.company_address = t.a0
# Company with 1000 shares @ 10^6 wei / share
tester.c = tester.s.contract(contract_code, language='viper',
tester.c = tester.s.contract(contract_code, language='vyper',
args=[tester.company_address, 1000, 10**6])
return tester

Expand Down
10 changes: 5 additions & 5 deletions tests/examples/market_maker/test_on_chain_market_maker.py
@@ -1,12 +1,12 @@
import pytest
from viper import compiler
from vyper import compiler


@pytest.fixture
def market_maker(t, chain):
t.languages['viper'] = compiler.Compiler()
t.languages['vyper'] = compiler.Compiler()
contract_code = open('examples/market_maker/on_chain_market_maker.v.py').read()
return chain.contract(contract_code, language='viper')
return chain.contract(contract_code, language='vyper')


TOKEN_NAME = "Vipercoin"
Expand All @@ -18,9 +18,9 @@ def market_maker(t, chain):

@pytest.fixture
def erc20(t, chain):
t.languages['viper'] = compiler.Compiler()
t.languages['vyper'] = compiler.Compiler()
contract_code = open('examples/tokens/vipercoin.v.py').read()
return chain.contract(contract_code, language='viper', args=[TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS, TOKEN_INITIAL_SUPPLY])
return chain.contract(contract_code, language='vyper', args=[TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS, TOKEN_INITIAL_SUPPLY])


def test_initial_statet(market_maker, utils):
Expand Down
16 changes: 8 additions & 8 deletions tests/examples/safe_remote_purchase/test_safe_remote_purchase.py
Expand Up @@ -19,8 +19,8 @@
def srp_tester():
t = tester
tester.s = t.Chain()
from viper import compiler
t.languages["viper"] = compiler.Compiler()
from vyper import compiler
t.languages["vyper"] = compiler.Compiler()
return tester


Expand All @@ -35,9 +35,9 @@ def check_balance(tester):
def test_initial_state(srp_tester, assert_tx_failed):
assert check_balance(srp_tester) == [INIT_BAL, INIT_BAL]
# Inital deposit has to be divisible by two
assert_tx_failed(lambda: srp_tester.s.contract(contract_code, language="viper", args=[], value=1))
assert_tx_failed(lambda: srp_tester.s.contract(contract_code, language="vyper", args=[], value=1))
# Seller puts item up for sale
srp_tester.c = tester.s.contract(contract_code, language="viper", args=[], value=2)
srp_tester.c = tester.s.contract(contract_code, language="vyper", args=[], value=2)
# Check that the seller is set correctly
assert utils.remove_0x_head(srp_tester.c.get_seller()) == srp_tester.accounts[0].hex()
# Check if item value is set correctly (Half of deposit)
Expand All @@ -49,20 +49,20 @@ def test_initial_state(srp_tester, assert_tx_failed):


def test_abort(srp_tester, assert_tx_failed):
srp_tester.c = srp_tester.s.contract(contract_code, language="viper", args=[], value=2)
srp_tester.c = srp_tester.s.contract(contract_code, language="vyper", args=[], value=2)
# Only sender can trigger refund
assert_tx_failed(lambda: srp_tester.c.abort(sender=srp_tester.k2))
# Refund works correctly
srp_tester.c.abort(sender=srp_tester.k0)
assert check_balance(srp_tester) == [INIT_BAL, INIT_BAL]
# Purchase in process, no refund possible
srp_tester.c = srp_tester.s.contract(contract_code, language="viper", args=[], value=2)
srp_tester.c = srp_tester.s.contract(contract_code, language="vyper", args=[], value=2)
srp_tester.c.purchase(value=2, sender=srp_tester.k1)
assert_tx_failed(lambda: srp_tester.c.abort(sender=srp_tester.k0))


def test_purchase(srp_tester, assert_tx_failed):
srp_tester.c = srp_tester.s.contract(contract_code, language="viper", args=[], value=2)
srp_tester.c = srp_tester.s.contract(contract_code, language="vyper", args=[], value=2)
# Purchase for too low/high price
assert_tx_failed(lambda: srp_tester.c.purchase(value=1, sender=srp_tester.k1))
assert_tx_failed(lambda: srp_tester.c.purchase(value=3, sender=srp_tester.k1))
Expand All @@ -79,7 +79,7 @@ def test_purchase(srp_tester, assert_tx_failed):


def test_received(srp_tester, assert_tx_failed):
srp_tester.c = srp_tester.s.contract(contract_code, language="viper", args=[], value=2)
srp_tester.c = srp_tester.s.contract(contract_code, language="vyper", args=[], value=2)
# Can only be called after purchase
assert_tx_failed(lambda: srp_tester.c.received(sender=srp_tester.k1))
# Purchase completed
Expand Down
Expand Up @@ -335,14 +335,14 @@ class TestViperERC20(TestERC20):
def setUpClass(cls):
super(TestViperERC20, cls).setUpClass()

from viper import compiler
cls.t.languages['viper'] = compiler.Compiler()
from vyper import compiler
cls.t.languages['vyper'] = compiler.Compiler()
contract_code = open(PATH_TO_CONTRACTS + '/../../../../examples/tokens/ERC20_solidity_compatible/ERC20.v.py').read()
cls.c = cls.s.contract(contract_code, language='viper')
cls.c = cls.s.contract(contract_code, language='vyper')
# Bad version of contract where totalSupply / num_issued never gets updated after init
# (required for full decision/branch coverage)
bad_code = contract_code.replace("self.num_issued = num256_add", "x = num256_add")
cls.c_bad = cls.s.contract(bad_code, language='viper')
cls.c_bad = cls.s.contract(bad_code, language='vyper')

cls.initial_state = cls.s.snapshot()
cls.strict_log_mode = True
Expand Down
Expand Up @@ -11,8 +11,8 @@
def extract_language(sourcefile):
languages = {
'.sol': 'solidity',
'.vy': 'viper',
'.py': 'viper' # hack to handle new .v.py suggested Viper extension
'.vy': 'vyper',
'.py': 'vyper' # hack to handle new .v.py suggested Viper extension
}
_, ext = os.path.splitext(sourcefile)
language = languages[ext]
Expand Down
6 changes: 3 additions & 3 deletions tests/examples/tokens/test_vipercoin.py
Expand Up @@ -14,12 +14,12 @@
def token_tester():
t = tester
tester.s = t.Chain()
from viper import compiler
t.languages['viper'] = compiler.Compiler()
from vyper import compiler
t.languages['vyper'] = compiler.Compiler()
contract_code = open('examples/tokens/vipercoin.v.py').read()
tester.c = tester.s.contract(
contract_code,
language='viper',
language='vyper',
args=[TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS, TOKEN_INITIAL_SUPPLY]
)
return tester
Expand Down
6 changes: 3 additions & 3 deletions tests/examples/voting/test_ballot.py
Expand Up @@ -17,10 +17,10 @@ def setUp(self):
self.t = tester
self.s = self.t.Chain()
self.s.head_state.gas_limit = 10**7
from viper import compiler
self.t.languages['viper'] = compiler.Compiler()
from vyper import compiler
self.t.languages['vyper'] = compiler.Compiler()
contract_code = open('examples/voting/ballot.v.py').read()
self.c = self.s.contract(contract_code, language='viper', args=[["Clinton", "Trump"]])
self.c = self.s.contract(contract_code, language='vyper', args=[["Clinton", "Trump"]])

def test_initial_state(self):
# Check chairperson is msg.sender
Expand Down
4 changes: 2 additions & 2 deletions tests/examples/wallet/test_wallet.py
Expand Up @@ -3,7 +3,7 @@
t.s = t.Chain()
t.s.head_state.gas_limit = 10**9

x = t.s.contract(open('examples/wallet/wallet.v.py').read(), args=[[t.a1, t.a2, t.a3, t.a4, t.a5], 3], language='viper')
x = t.s.contract(open('examples/wallet/wallet.v.py').read(), args=[[t.a1, t.a2, t.a3, t.a4, t.a5], 3], language='vyper')
print(t.s.last_tx.data[-192:])
# Sends wei to the contract for future transactions gas costs
t.s.tx(sender=t.k1, to=x.address, value=10**17)
Expand Down Expand Up @@ -56,7 +56,7 @@ def test_javascript_signatures():
assert '0x' + utils.encode_hex(utils.sha3(utils.ecrecover_to_pub(h2, sigs[1][0], sigs[1][1], sigs[1][2]))[12:]) == accounts[1]

# Set the owners to zero addresses
x2 = t.s.contract(open('examples/wallet/wallet.v.py').read(), args=[accounts + [t.a3, zero_address, zero_address], 2], language='viper')
x2 = t.s.contract(open('examples/wallet/wallet.v.py').read(), args=[accounts + [t.a3, zero_address, zero_address], 2], language='vyper')
t.s.tx(sender=t.k1, to=x2.address, value=10**17)

# There's no need to pass in signatures because the owners are 0 addresses causing them to default to valid signatures
Expand Down
4 changes: 2 additions & 2 deletions tests/parser/exceptions/test_constancy_exception.py
@@ -1,8 +1,8 @@
import pytest
from pytest import raises

from viper import compiler
from viper.exceptions import ConstancyViolationException
from vyper import compiler
from vyper.exceptions import ConstancyViolationException


fail_list = [
Expand Down

0 comments on commit 17c3e01

Please sign in to comment.