handle (panic) on missing payment chosen platform #2646
Merged
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
staszek-krotki
force-pushed
the
staszek/yagna-2639/handle-missing-payment-chosen-platform
branch
from
fb26018
to
23194ed
Compare
…rm' of github.com:golemfactory/yagna into staszek/yagna-2639/handle-missing-payment-chosen-platform
pwalski
reviewed
Jul 6, 2023
agent/provider/src/market/negotiator/builtin/demand_validation.rs
Outdated
Show resolved
Hide resolved
pwalski
reviewed
Jul 6, 2023
pwalski
reviewed
Jul 6, 2023
agent/provider/src/market/negotiator/builtin/demand_validation.rs
Outdated
Show resolved
Hide resolved
pwalski
suggested changes
Jul 6, 2023
core/payment/src/api/allocations.rs
Outdated
| @@ -49,7 +48,7 @@ async fn create_allocation( | |||
| let payment_platform = allocation | |||
| .payment_platform | |||
| .clone() | |||
| .unwrap_or_else(|| DEFAULT_PAYMENT_PLATFORM.to_string()); | |||
| .expect("payment platform not provided"); | |||
There was a problem hiding this comment.
It panics on None. Please convert it to error response.
There was a problem hiding this comment.
Do we even still need it after adding new Negotiator?
core/payment/src/models/agreement.rs
Outdated
| @@ -39,7 +38,7 @@ impl WriteObj { | |||
| let payment_platform = demand_properties | |||
| .pointer("/golem/com/payment/chosen-platform") | |||
| .as_typed(Value::as_str) | |||
| .unwrap_or(DEFAULT_PAYMENT_PLATFORM) | |||
| .expect("Demand property golem.com.payment.chosen-platform does not exist") | |||
There was a problem hiding this comment.
As before, it panics, so it should be either converted to Error or removed if unnecessary (because of new Negotiator).
pwalski
reviewed
Jul 7, 2023
pwalski
reviewed
Jul 7, 2023
pwalski
reviewed
Jul 7, 2023
pwalski
reviewed
Jul 7, 2023
pwalski
reviewed
Jul 7, 2023
pwalski
suggested changes
Jul 7, 2023
Co-authored-by: pwalski <4924911+pwalski@users.noreply.github.com>
Co-authored-by: pwalski <4924911+pwalski@users.noreply.github.com>
Co-authored-by: pwalski <4924911+pwalski@users.noreply.github.com>
Co-authored-by: pwalski <4924911+pwalski@users.noreply.github.com>
Co-authored-by: pwalski <4924911+pwalski@users.noreply.github.com>
pwalski
approved these changes
Jul 7, 2023
staszek-krotki
deleted the
staszek/yagna-2639/handle-missing-payment-chosen-platform
branch
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.
No description provided.