[WIP] Chore/fix commit tests #391
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -294,7 +294,7 @@ end | |
| -- be from our own root ledger, or from a sub-ledger that is precisely the same | ||
| -- as our own. | ||
| local function validate_new_peer_ledger(base, request) | ||
| ao.event({ "Validating peer ledger: ", { action = request.action } }) | ||
|
|
||
| -- Check if the request is from the root ledger. | ||
| if is_root(base) or (base.token == request.from) then | ||
|
|
@@ -308,7 +308,7 @@ local function validate_new_peer_ledger(base, request) | |
| -- modified to remove the `authority' and `scheduler' fields. | ||
| -- This ensures that the process we are receiving the `credit-notice` from | ||
| -- has the same structure as our own process. | ||
| ao.event({ "Calculating expected `base` from self" }) | ||
| local status, proc, expected | ||
| status, proc = ao.resolve({"as", "[email protected]", base}, "process") | ||
| -- Reset the `authority' and `scheduler' fields to nil, to ensure that the | ||
|
|
@@ -320,12 +320,10 @@ local function validate_new_peer_ledger(base, request) | |
| proc, | ||
| { path = "id", commitments = "none" } | ||
| ) | ||
| ao.event("debug_base", { "Expected `from-base`", { status = status, expected = expected, proc = proc } }) | ||
| -- Check if the `from-base' field is present in the assignment. | ||
| if not request["from-base"] then | ||
| ao.event({ "`from-base` field not found in message" }) | ||
| return false | ||
| end | ||
|
|
||
|
|
@@ -474,6 +472,10 @@ function validate_request(incoming_base, assignment) | |
| }) | ||
| end | ||
|
|
||
| ao.event({ "ensure_initialized", { | ||
| status = status, | ||
| base = base | ||
| }}) | ||
| -- First, ensure that the message has not already been processed. | ||
| ao.event("Deduplicating message.", { | ||
| ["history-length"] = #(base.dedup or {}) | ||
|
|
@@ -598,7 +600,8 @@ local function debit_balance(base, request) | |
| if type(source_balance) ~= "number" then | ||
| return "error", log_result(base, "error", { | ||
| message = "Source balance is not a number.", | ||
| balance = source_balance, | ||
| type = type(source_balance) | ||
| }) | ||
| end | ||
|
|
||
|
|
@@ -620,7 +623,7 @@ local function debit_balance(base, request) | |
| }) | ||
| end | ||
|
|
||
| ao.event({ "Deducting funds" }) | ||
| base.balance[source] = source_balance - request.quantity | ||
| ao.event({ "Balances after deduction:", | ||
| { balances = base.balance, ledgers = base.ledgers } } | ||
|
|
@@ -655,10 +658,20 @@ end | |
| -- Xfer in: Sub-ledger = Dec User balance | ||
| -- C-N in: Root = Inc User balance, Dec Sub-ledger balance | ||
| function transfer(base, assignment) | ||
| ao.event({ "Transfer request received", { | ||
| balances = base.balance, | ||
| ledgers = base.ledgers, | ||
| path = assignment.path, | ||
| body = assignment.body | ||
| } }) | ||
| -- Verify the security of the request. | ||
| local status, request | ||
| status, base, request = validate_request(base, assignment) | ||
| ao.event({ "Transfer request validated", { | ||
| status = status, | ||
| balances = base.balance, | ||
| ledgers = base.ledgers | ||
| } }) | ||
| if status ~= "ok" or not request then | ||
| return "ok", base | ||
| end | ||
|
|
@@ -691,6 +704,7 @@ function transfer(base, assignment) | |
| -- another user. We credit the recipient's balance, or the sub-ledger's | ||
| -- balance if the request has a `route' key. | ||
| local direct_recipient = request.route or request.recipient | ||
| ao.event({ "Balances before credit", { balances = base.balance } }) | ||
| base.balance[direct_recipient] = | ||
| (base.balance[direct_recipient] or 0) + quantity | ||
| base = send(base, { | ||
|
|
@@ -700,12 +714,14 @@ function transfer(base, assignment) | |
| quantity = quantity, | ||
| sender = request.from | ||
| }) | ||
| ao.event({ "Balances after credit", { balances = base.balance } }) | ||
| return log_result(base, "ok", { | ||
| message = "Direct or root transfer processed successfully.", | ||
| from_user = request.from, | ||
| to = direct_recipient, | ||
| explicit_recipient = request.recipient, | ||
| quantity = quantity, | ||
| balances = base.balance | ||
| }) | ||
| end | ||
|
|
||
|
|
@@ -750,7 +766,7 @@ end | |
|
|
||
| -- Process credit notices from other ledgers. | ||
| _G["credit-notice"] = function (base, assignment) | ||
| ao.event({ "Credit-Notice received" }) | ||
|
|
||
| -- Verify the security of the request. | ||
| local status, request | ||
|
|
@@ -801,7 +817,8 @@ _G["credit-notice"] = function (base, assignment) | |
| to_ledger = request.sender, | ||
| to_user = request.recipient, | ||
| quantity = quantity, | ||
| balance = base.balance[request.recipient], | ||
| balances = base.balance | ||
| }) | ||
| end | ||
|
|
||
|
|
@@ -867,7 +884,7 @@ end | |
| --- We route any `action' to the appropriate function based on the request path. | ||
| function compute(base, assignment) | ||
| ao.event({ "compute called", | ||
| { balance = base.balance, ledgers = base.ledgers, action = assignment.body.action or "unknown" } }) | ||
|
|
||
| assignment.body.action = string.lower(assignment.body.action or "") | ||
|
|
||
|
|
@@ -880,6 +897,7 @@ function compute(base, assignment) | |
| elseif assignment.body.action == "register-remote" then | ||
| return _G["register-remote"](base, assignment) | ||
| else | ||
| ao.event({ "Unknown action received, initializing process." }) | ||
|
Author
There was a problem hiding this comment. end improved hyper-token lua events |
||
| -- Handle unknown `action' values. | ||
| _, base = ensure_initialized(base, assignment) | ||
| base.results = { | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -557,7 +557,7 @@ validate_large_message_from_http_test() -> | |
|
|
||
| committed_id_test() -> | ||
| Msg = #{ <<"basic">> => <<"value">> }, | ||
| Signed = hb_message:commit(Msg, #{ priv_wallet => hb:wallet() }), | ||
|
Author
There was a problem hiding this comment. [test] Pass wallet as opt to hb_message:commit |
||
| ?assert(hb_message:verify(Signed, all, #{})), | ||
| ?event({signed_msg, Signed}), | ||
| UnsignedID = hb_message:id(Signed, none), | ||
|
|
@@ -599,8 +599,14 @@ commit_secret_key_test() -> | |
|
|
||
| multicommitted_id_test() -> | ||
| Msg = #{ <<"basic">> => <<"value">> }, | ||
| Signed1 = hb_message:commit( | ||
| Msg, | ||
| #{ priv_wallet => Wallet1 = ar_wallet:new() } | ||
| ), | ||
| Signed2 = hb_message:commit( | ||
| Signed1, | ||
| #{ priv_wallet => Wallet2 = ar_wallet:new() } | ||
| ), | ||
| Addr1 = hb_util:human_id(ar_wallet:to_address(Wallet1)), | ||
| Addr2 = hb_util:human_id(ar_wallet:to_address(Wallet2)), | ||
| ?event({signed_msg, Signed2}), | ||
|
|
@@ -624,6 +630,6 @@ sign_and_verify_link_test() -> | |
| }, | ||
| NormMsg = hb_message:convert(Msg, <<"[email protected]">>, #{}), | ||
| ?event({msg, NormMsg}), | ||
| Signed = hb_message:commit(NormMsg, #{ priv_wallet => hb:wallet() }), | ||
| ?event({signed_msg, Signed}), | ||
| ?assert(hb_message:verify(Signed)). | ||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
start. genesis_wasm -> genesis-wasm changes