Skip to content

Commit

Permalink
Merge pull request #366 from BoostryJP/fix/#361
Browse files Browse the repository at this point in the history
feat: increase the maximum supply
  • Loading branch information
YoshihitoAso authored Aug 2, 2022
2 parents f66d384 + 3579d04 commit e73521a
Show file tree
Hide file tree
Showing 17 changed files with 68 additions and 68 deletions.
16 changes: 8 additions & 8 deletions app/model/schema/token.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
class IbetStraightBondCreate(BaseModel):
"""ibet Straight Bond schema (Create)"""
name: str = Field(max_length=100)
total_supply: int = Field(..., ge=0, le=100_000_000_000)
total_supply: int = Field(..., ge=0, le=1_000_000_000_000)
face_value: int = Field(..., ge=0, le=5_000_000_000)
purpose: str = Field(max_length=2000)
symbol: Optional[str] = Field(max_length=100)
Expand Down Expand Up @@ -139,7 +139,7 @@ def personal_info_contract_address_is_valid_address(cls, v):
class IbetStraightBondAdditionalIssue(BaseModel):
"""ibet Straight Bond schema (Additional Issue)"""
account_address: str
amount: int = Field(..., ge=1, le=100_000_000_000)
amount: int = Field(..., ge=1, le=1_000_000_000_000)

@validator("account_address")
def account_address_is_valid_address(cls, v):
Expand All @@ -151,7 +151,7 @@ def account_address_is_valid_address(cls, v):
class IbetStraightBondRedeem(BaseModel):
"""ibet Straight Bond schema (Redeem)"""
account_address: str
amount: int = Field(..., ge=1, le=100_000_000_000)
amount: int = Field(..., ge=1, le=1_000_000_000_000)

@validator("account_address")
def account_address_is_valid_address(cls, v):
Expand All @@ -165,7 +165,7 @@ class IbetStraightBondTransfer(BaseModel):
token_address: str
from_address: str
to_address: str
amount: int = Field(..., ge=1, le=100_000_000_000)
amount: int = Field(..., ge=1, le=1_000_000_000_000)

@validator("token_address")
def token_address_is_valid_address(cls, v):
Expand All @@ -191,7 +191,7 @@ class IbetShareCreate(BaseModel):
name: str = Field(max_length=100)
issue_price: int = Field(..., ge=0, le=5_000_000_000)
principal_value: int = Field(..., ge=0, le=5_000_000_000)
total_supply: int = Field(..., ge=0, le=100_000_000_000)
total_supply: int = Field(..., ge=0, le=1_000_000_000_000)
symbol: Optional[str] = Field(max_length=100)
dividends: Optional[float] = Field(None, ge=0.00, le=5_000_000_000.00)
dividend_record_date: Optional[YYYYMMDD_constr]
Expand Down Expand Up @@ -281,7 +281,7 @@ class IbetShareTransfer(BaseModel):
token_address: str
from_address: str
to_address: str
amount: int = Field(..., ge=1, le=100_000_000_000)
amount: int = Field(..., ge=1, le=1_000_000_000_000)

@validator("token_address")
def token_address_is_valid_address(cls, v):
Expand All @@ -305,7 +305,7 @@ def to_address_is_valid_address(cls, v):
class IbetShareAdditionalIssue(BaseModel):
"""ibet Share schema (Additional Issue)"""
account_address: str
amount: int = Field(..., ge=1, le=100_000_000_000)
amount: int = Field(..., ge=1, le=1_000_000_000_000)

@validator("account_address")
def account_address_is_valid_address(cls, v):
Expand All @@ -317,7 +317,7 @@ def account_address_is_valid_address(cls, v):
class IbetShareRedeem(BaseModel):
"""ibet Share schema (Redeem)"""
account_address: str
amount: int = Field(..., ge=1, le=100_000_000_000)
amount: int = Field(..., ge=1, le=1_000_000_000_000)

@validator("account_address")
def account_address_is_valid_address(cls, v):
Expand Down
18 changes: 9 additions & 9 deletions tests/model/blockchain/test_token_IbetShare.py
Original file line number Diff line number Diff line change
Expand Up @@ -1179,17 +1179,17 @@ def test_error_3(self, db):
"token_address": "0x1234567890123456789012345678901234567890",
"from_address": "0x1234567890123456789012345678901234567890",
"to_address": "0x1234567890123456789012345678901234567890",
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}
with pytest.raises(ValidationError) as exc_info:
IbetShareTransfer(**_data)
assert exc_info.value.errors() == [
{
"ctx": {
"limit_value": 100_000_000_000
"limit_value": 1_000_000_000_000
},
"loc": ("amount",),
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le"
}
]
Expand Down Expand Up @@ -1617,18 +1617,18 @@ def test_error_4(self, db):

_data = {
"account_address": issuer_address,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}

with pytest.raises(ValidationError) as exc_info:
IbetShareAdditionalIssue(**_data)
assert exc_info.value.errors() == [
{
"ctx": {
"limit_value": 100_000_000_000
"limit_value": 1_000_000_000_000
},
"loc": ("amount",),
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le"
}
]
Expand Down Expand Up @@ -2045,18 +2045,18 @@ def test_error_4(self, db):

_data = {
"account_address": issuer_address,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}

with pytest.raises(ValidationError) as exc_info:
IbetShareRedeem(**_data)
assert exc_info.value.errors() == [
{
"ctx": {
"limit_value": 100_000_000_000
"limit_value": 1_000_000_000_000
},
"loc": ("amount",),
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le"
}
]
Expand Down
18 changes: 9 additions & 9 deletions tests/model/blockchain/test_token_IbetStraightBond.py
Original file line number Diff line number Diff line change
Expand Up @@ -1156,17 +1156,17 @@ def test_error_3(self, db):
"token_address": token_address,
"from_address": issuer_address,
"to_address": to_address,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}
with pytest.raises(ValidationError) as exc_info:
IbetStraightBondTransfer(**_data)
assert exc_info.value.errors() == [
{
"ctx": {
"limit_value": 100_000_000_000
"limit_value": 1_000_000_000_000
},
"loc": ("amount",),
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le"
}
]
Expand Down Expand Up @@ -1559,17 +1559,17 @@ def test_error_4(self, db):
issuer_address = test_account.get("address")
_data = {
"account_address": issuer_address,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}
with pytest.raises(ValidationError) as exc_info:
IbetStraightBondAdditionalIssue(**_data)
assert exc_info.value.errors() == [
{
"ctx": {
"limit_value": 100_000_000_000
"limit_value": 1_000_000_000_000
},
"loc": ("amount",),
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le"
}
]
Expand Down Expand Up @@ -1949,17 +1949,17 @@ def test_error_4(self, db):
issuer_address = test_account.get("address")
_data = {
"account_address": issuer_address,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}
with pytest.raises(ValidationError) as exc_info:
IbetStraightBondRedeem(**_data)
assert exc_info.value.errors() == [
{
"ctx": {
"limit_value": 100_000_000_000
"limit_value": 1_000_000_000_000
},
"loc": ("amount",),
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le"
}
]
Expand Down
6 changes: 3 additions & 3 deletions tests/test_app_routers_bond_bulk_transfer_POST.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def test_error_2(self, client, db):
"token_address": self.req_tokens[0],
"from_address": self.from_address,
"to_address": self.to_address,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}
]
resp = client.post(
Expand All @@ -308,14 +308,14 @@ def test_error_2(self, client, db):
"detail": [
{
"ctx": {
"limit_value": 100_000_000_000
"limit_value": 1_000_000_000_000
},
"loc": [
"body",
0,
"amount"
],
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le"
},
]
Expand Down
6 changes: 3 additions & 3 deletions tests/test_app_routers_bond_tokens_POST.py
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ def test_error_2_6(self, client, db):
req_param = {
"name": GetRandomStr(101),
"symbol": GetRandomStr(101),
"total_supply": 100_000_000_001,
"total_supply": 1_000_000_000_001,
"face_value": 5_000_000_001,
"redemption_date": "20211231",
"redemption_value": 5_000_000_001,
Expand Down Expand Up @@ -791,9 +791,9 @@ def test_error_2_6(self, client, db):
},
{
"loc": ["body", "total_supply"],
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le",
"ctx": {"limit_value": 100000000000}
"ctx": {"limit_value": 1000000000000}
},
{
"loc": ["body", "face_value"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def test_error_3(self, client, db):
# request target API
req_param = {
"account_address": _issuer_address,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}

resp = client.post(
Expand All @@ -300,13 +300,13 @@ def test_error_3(self, client, db):
"detail": [
{
"ctx": {
"limit_value": 100_000_000_000
"limit_value": 1_000_000_000_000
},
"loc": [
"body",
"amount"
],
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le"
},
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ def test_error_1_3_2(self, client, db):
req_param = [
{
"account_address": test_account_1,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}
]
resp = client.post(
Expand All @@ -394,9 +394,9 @@ def test_error_1_3_2(self, client, db):
'detail': [
{
'loc': ['body', 0, 'amount'],
'msg': 'ensure this value is less than or equal to 100000000000',
'msg': 'ensure this value is less than or equal to 1000000000000',
'type': 'value_error.number.not_le',
'ctx': {'limit_value': 100000000000}
'ctx': {'limit_value': 1000000000000}
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def test_error_3(self, client, db):
# request target API
req_param = {
"account_address": _issuer_address,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}

resp = client.post(
Expand All @@ -300,13 +300,13 @@ def test_error_3(self, client, db):
"detail": [
{
"ctx": {
"limit_value": 100_000_000_000
"limit_value": 1_000_000_000_000
},
"loc": [
"body",
"amount"
],
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le"
},
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ def test_error_1_3_2(self, client, db):
req_param = [
{
"account_address": test_account_1,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}
]
resp = client.post(
Expand All @@ -394,9 +394,9 @@ def test_error_1_3_2(self, client, db):
'detail': [
{
'loc': ['body', 0, 'amount'],
'msg': 'ensure this value is less than or equal to 100000000000',
'msg': 'ensure this value is less than or equal to 1000000000000',
'type': 'value_error.number.not_le',
'ctx': {'limit_value': 100000000000}
'ctx': {'limit_value': 1000000000000}
}
]
}
Expand Down
6 changes: 3 additions & 3 deletions tests/test_app_routers_bond_transfers_POST.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def test_error_2(self, client, db):
"token_address": _token_address,
"from_address": _from_address,
"to_address": _to_address,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}
resp = client.post(
self.test_url,
Expand All @@ -262,13 +262,13 @@ def test_error_2(self, client, db):
"detail": [
{
"ctx": {
"limit_value": 100_000_000_000
"limit_value": 1_000_000_000_000
},
"loc": [
"body",
"amount"
],
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le"
},
]
Expand Down
6 changes: 3 additions & 3 deletions tests/test_app_routers_share_bulk_transfer_POST.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def test_error_2(self, client, db):
"token_address": self.req_tokens[0],
"from_address": self.from_address,
"to_address": self.to_address,
"amount": 100_000_000_001
"amount": 1_000_000_000_001
}
]
resp = client.post(
Expand All @@ -309,14 +309,14 @@ def test_error_2(self, client, db):
"detail": [
{
"ctx": {
"limit_value": 100_000_000_000
"limit_value": 1_000_000_000_000
},
"loc": [
"body",
0,
"amount"
],
"msg": "ensure this value is less than or equal to 100000000000",
"msg": "ensure this value is less than or equal to 1000000000000",
"type": "value_error.number.not_le"
},
]
Expand Down
Loading

0 comments on commit e73521a

Please sign in to comment.