Skip to content

Commit

Permalink
more ci fixes?
Browse files Browse the repository at this point in the history
  • Loading branch information
ebatsell committed Nov 29, 2024
1 parent e1622dd commit 31e91a2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
env:
TIP_ROUTER_PROGRAM_ID: ${{ env.TIP_ROUTER_PROGRAM_ID }}
SBF_OUT_DIR: ${{ github.workspace }}/target/sbf-solana-solana/release
ANCHOR_IDL_BUILD_SKIP_LINT: TRUE
ANCHOR_IDL_BUILD_SKIP_LINT: true
- name: Upload MEV Tip Distribution NCN program
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -159,13 +159,13 @@ jobs:
path: integration_tests/tests/fixtures/
- uses: taiki-e/install-action@nextest
# Test the non-BPF tests and the BPF tests separately
- run: cargo nextest run --all-features -E 'not test(bpf)'
- run: ANCHOR_IDL_BUILD_SKIP_LINT=true cargo nextest run --all-features -E 'not test(bpf)'
env:
ANCHOR_IDL_BUILD_SKIP_LINT: TRUE
- run: cargo nextest run --all-features -E 'test(bpf)'
ANCHOR_IDL_BUILD_SKIP_LINT: true
- run: ANCHOR_IDL_BUILD_SKIP_LINT=true cargo nextest run --all-features -E 'test(bpf)'
env:
SBF_OUT_DIR: ${{ github.workspace }}/integration_tests/tests/fixtures
ANCHOR_IDL_BUILD_SKIP_LINT: TRUE
ANCHOR_IDL_BUILD_SKIP_LINT: true

# create_release:
# name: Create Release
Expand Down
8 changes: 4 additions & 4 deletions clients/js/jito_tip_router/errors/jitoTipRouter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ export const JITO_TIP_ROUTER_ERROR__DUPLICATE_VOTE_CAST = 0x2219; // 8729
export const JITO_TIP_ROUTER_ERROR__OPERATOR_VOTES_FULL = 0x221a; // 8730
/** BallotTallyFull: Merkle root tally full */
export const JITO_TIP_ROUTER_ERROR__BALLOT_TALLY_FULL = 0x221b; // 8731
/** ConsensusAlreadyReached: Consensus already reached */
/** ConsensusAlreadyReached: Consensus already reached, cannot change vote */
export const JITO_TIP_ROUTER_ERROR__CONSENSUS_ALREADY_REACHED = 0x221c; // 8732
/** ConsensusNotReached: Consensus not reached */
export const JITO_TIP_ROUTER_ERROR__CONSENSUS_NOT_REACHED = 0x221d; // 8733
/** EpochSnapshotNotFinalized: Epoch snapshot not finalized */
export const JITO_TIP_ROUTER_ERROR__EPOCH_SNAPSHOT_NOT_FINALIZED = 0x221e; // 8734
/** VotingNotValid: Voting not valid */
/** VotingNotValid: Voting not valid, too many slots after consensus reached */
export const JITO_TIP_ROUTER_ERROR__VOTING_NOT_VALID = 0x221f; // 8735
/** TieBreakerAdminInvalid: Tie breaker admin invalid */
export const JITO_TIP_ROUTER_ERROR__TIE_BREAKER_ADMIN_INVALID = 0x2220; // 8736
Expand Down Expand Up @@ -149,7 +149,7 @@ if (process.env.NODE_ENV !== 'production') {
[JITO_TIP_ROUTER_ERROR__CAST_TO_IMPRECISE_NUMBER_ERROR]: `Cast to imprecise number error`,
[JITO_TIP_ROUTER_ERROR__CONFIG_MINT_LIST_FULL]: `NCN config vaults are at capacity`,
[JITO_TIP_ROUTER_ERROR__CONFIG_MINTS_NOT_UPDATED]: `Config supported mints do not match NCN Vault Count`,
[JITO_TIP_ROUTER_ERROR__CONSENSUS_ALREADY_REACHED]: `Consensus already reached`,
[JITO_TIP_ROUTER_ERROR__CONSENSUS_ALREADY_REACHED]: `Consensus already reached, cannot change vote`,
[JITO_TIP_ROUTER_ERROR__CONSENSUS_NOT_REACHED]: `Consensus not reached`,
[JITO_TIP_ROUTER_ERROR__DENOMINATOR_IS_ZERO]: `Zero in the denominator`,
[JITO_TIP_ROUTER_ERROR__DUPLICATE_MINTS_IN_TABLE]: `Duplicate mints in table`,
Expand Down Expand Up @@ -178,7 +178,7 @@ if (process.env.NODE_ENV !== 'production') {
[JITO_TIP_ROUTER_ERROR__VAULT_INDEX_ALREADY_IN_USE]: `Vault index already in use by a different mint`,
[JITO_TIP_ROUTER_ERROR__VAULT_OPERATOR_DELEGATION_FINALIZED]: `Vault operator delegation is already finalized - should not happen`,
[JITO_TIP_ROUTER_ERROR__VOTING_NOT_FINALIZED]: `Voting not finalized`,
[JITO_TIP_ROUTER_ERROR__VOTING_NOT_VALID]: `Voting not valid`,
[JITO_TIP_ROUTER_ERROR__VOTING_NOT_VALID]: `Voting not valid, too many slots after consensus reached`,
[JITO_TIP_ROUTER_ERROR__WEIGHT_MINTS_DO_NOT_MATCH_LENGTH]: `Weight mints do not match - length`,
[JITO_TIP_ROUTER_ERROR__WEIGHT_MINTS_DO_NOT_MATCH_MINT_HASH]: `Weight mints do not match - mint hash`,
[JITO_TIP_ROUTER_ERROR__WEIGHT_NOT_FOUND]: `Weight not found`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,17 @@ pub enum JitoTipRouterError {
/// 8731 - Merkle root tally full
#[error("Merkle root tally full")]
BallotTallyFull = 0x221B,
/// 8732 - Consensus already reached
#[error("Consensus already reached")]
/// 8732 - Consensus already reached, cannot change vote
#[error("Consensus already reached, cannot change vote")]
ConsensusAlreadyReached = 0x221C,
/// 8733 - Consensus not reached
#[error("Consensus not reached")]
ConsensusNotReached = 0x221D,
/// 8734 - Epoch snapshot not finalized
#[error("Epoch snapshot not finalized")]
EpochSnapshotNotFinalized = 0x221E,
/// 8735 - Voting not valid
#[error("Voting not valid")]
/// 8735 - Voting not valid, too many slots after consensus reached
#[error("Voting not valid, too many slots after consensus reached")]
VotingNotValid = 0x221F,
/// 8736 - Tie breaker admin invalid
#[error("Tie breaker admin invalid")]
Expand Down

0 comments on commit 31e91a2

Please sign in to comment.