Billing #154
Merged
Billing #154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pull Request Test Coverage Report for Build 124
💛 - Coveralls |
boz
approved these changes
Mar 27, 2018
app/app.go
Outdated
| @@ -235,6 +235,8 @@ func (app *app) Commit() tmtypes.ResponseCommit { | |||
| app.mfacilitator.OnCommit(app.state) | |||
| } | |||
|
|
|||
| lease.ProcessLeases(app.state) | |||
app/market/engine_test.go
Outdated
| for idx := range groups.GetItems() { | ||
| require.NoError(t, state_.DeploymentGroup().Save(groups.GetItems()[idx])) | ||
| require.NoError(t, state.DeploymentGroup().Save(groups.GetItems()[idx])) |
There was a problem hiding this comment.
should be able to do the
for _, item := range groups.GetItems() {
require.NoError(t,state.Save(item))
}thing here.
cmd/akashd/init.go
Outdated
| ) | ||
|
|
||
| const ( | ||
| maxTokens uint64 = 1000000000 | ||
| maxTokens uint64 = math.MaxUint64 |
There was a problem hiding this comment.
I think this will screw up the integration tests here.
- Simple matter of changing the value in the test or ideally just referencing a constant.
- The json lib we're using there maxes out at
int64which won't be able to holdmath.MaxUint64. - Also, I think we're supposed to have a billion tokens total.
There was a problem hiding this comment.
Yeah it read it as -1:
Evaluation of main failed:
/main/account-send/account-balance/akash: ../akash -d ./data/client query account 22CDFF3E908986DE2F4B1D279667BA02B84CD7D6: balance: received -1 expected 1000000000
-===[BEGIN STDOUT]===-
{
"address": "22CDFF3E908986DE2F4B1D279667BA02B84CD7D6",
"balance": 18446744073709551615
}
testutil/state.go
Outdated
| @@ -20,6 +21,7 @@ func CreateAccount(t *testing.T, state state.State) (*types.Account, crypto.Priv | |||
| key := PrivateKey(t) | |||
| account := &types.Account{ | |||
| Address: key.PubKey().Address(), | |||
| Balance: math.MaxUint64 / 2, | |||
There was a problem hiding this comment.
yeah let's do a constant somewhere for initial token count.
| @@ -87,7 +87,7 @@ func (e engine) processDeployment(state state.State, w txBuffer, deployment type | |||
| if !activeFound && order.State == types.Order_OPEN || order.State == types.Order_MATCHED { | |||
| activeFound = true | |||
| } | |||
| if order.EndAt <= height { | |||
| if order.State == types.Order_OPEN && order.EndAt <= height { | |||
added 2 commits
March 27, 2018 14:18
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #142
fixes #151
On lease create, check if tenant has balance >= lease price
process leases in market engine
for each active lease, send a billTenantTx
Lease app accepts and checks BillTenantTx
Lease app subtracts lease.Price from the tenant and sends lease.Price to the provider.