Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rpc] Simplify error response from execute_transaction_block of transaction_execution_api #12989

Merged
merged 9 commits into from
Aug 14, 2023
Merged

[rpc] Simplify error response from execute_transaction_block of transaction_execution_api #12989

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
612994a
handle QuorumDriverError
wlmyng Jul 13, 2023
1a758b5
error code for execution errors fault client. bump transient_error_co…
wlmyng Aug 1, 2023
988050d
address some nits
wlmyng Aug 8, 2023
4f5989d
suggestion on building new_map
wlmyng Aug 9, 2023
92e790b
address nits
wlmyng Aug 9, 2023
bef84d6
dont use random cuz then the string matching goes kaboom
wlmyng Aug 9, 2023
62a7fc9
assert on no nonretryableerrors and test
wlmyng Aug 10, 2023
27fb990
remove unused imports
wlmyng Aug 10, 2023
21f2774
rebasing is not always clean
wlmyng Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
suggestion on building new_map 
Co-authored-by: Lu Zhang <8418040+longbowlu@users.noreply.github.com>
  • Loading branch information
@wlmyng @longbowlu
wlmyng and longbowlu committed Aug 10, 2023
commit 4f5989d3d8cbbf672a26ff115d0db32e863e512e
4 changes: 3 additions & 1 deletion crates/sui-json-rpc/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ impl From<Error> for RpcError {

let mut new_map: BTreeMap<TransactionDigest, Vec<ObjectRef>> = BTreeMap::new();

for (digest, (pairs, _)) in conflicting_txes {
let new_map = conflicting_txes.into_iter()
.map(|(digest, (pairs, _))| (digest, pairs.into_iter().map(|_, obj_ref| obj_ref).collect()))
.collect::<BTreeMap<_, Vec<_>>>();
let mut new_vec = Vec::new();

for (_authority, obj_ref) in pairs {
Expand Down