Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

v1.1 backport custom error rename #9826

Merged

Conversation

CriesofCarrots
Copy link
Contributor

@CriesofCarrots CriesofCarrots commented Apr 30, 2020

Also remove librapay merge-conflict artifacts, which offend my sensibilities

@CriesofCarrots CriesofCarrots force-pushed the v1.1-backport-custom-error branch from 741da58 to cc89883 Compare April 30, 2020 20:10
@codecov
Copy link

codecov bot commented Apr 30, 2020

Codecov Report

Merging #9826 into v1.1 will decrease coverage by 0.0%.
The diff coverage is 18.4%.

@@           Coverage Diff           @@
##            v1.1   #9826     +/-   ##
=======================================
- Coverage   80.7%   80.6%   -0.1%     
=======================================
  Files        281     281             
  Lines      63768   63800     +32     
=======================================
- Hits       51487   51479      -8     
- Misses     12281   12321     +40     

@CriesofCarrots
Copy link
Contributor Author

@jackcmay , does this look good now?

@mvines
Copy link
Contributor

mvines commented May 1, 2020

lgtm

@CriesofCarrots CriesofCarrots merged commit 3aa52f9 into solana-labs:v1.1 May 1, 2020
mergify bot pushed a commit that referenced this pull request May 1, 2020
* Add program_error conversions (#9203)

* Rename CustomError to Custom (#9207)

* More custom error rename (#9227)

automerge

* Remove librapay conflicts

* Fix rebase

Co-authored-by: Jack May <jack@solana.com>
(cherry picked from commit 3aa52f9)

# Conflicts:
#	programs/librapay/Cargo.lock
#	programs/librapay/src/librapay_transaction.rs
#	programs/move_loader/src/processor.rs
#	runtime/src/bank/mod.rs
CriesofCarrots added a commit that referenced this pull request May 1, 2020
* Add program_error conversions (#9203)

* Rename CustomError to Custom (#9207)

* More custom error rename (#9227)

automerge

* Remove librapay conflicts

* Fix rebase

Co-authored-by: Jack May <jack@solana.com>
(cherry picked from commit 3aa52f9)
solana-grimes pushed a commit that referenced this pull request May 1, 2020
mvines added a commit to mvines/solana that referenced this pull request May 1, 2020
@CriesofCarrots CriesofCarrots deleted the v1.1-backport-custom-error branch May 1, 2020 23:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants