From 7fb8aacdcca935734ed1b6abc663aa1a658c2ecb Mon Sep 17 00:00:00 2001 From: jpbogle Date: Tue, 24 May 2022 18:29:12 -0700 Subject: [PATCH] Anchor rename --- .ammanrc.cjs | 2 +- .github/workflows/test.yml | 2 +- Anchor.toml | 6 +++--- cli/hydra_cli/src/main.rs | 4 ++-- programs/hydra/Cargo.toml | 2 +- .../{hydra-keypair.json => hydra_wallet-keypair.json} | 0 6 files changed, 8 insertions(+), 8 deletions(-) rename tests/test-keypairs/{hydra-keypair.json => hydra_wallet-keypair.json} (100%) diff --git a/.ammanrc.cjs b/.ammanrc.cjs index 50e3058..2d96ac4 100644 --- a/.ammanrc.cjs +++ b/.ammanrc.cjs @@ -26,7 +26,7 @@ const programs = { programId: programIds.fanout, deployPath: localDeployPath( path.join(__dirname, "target", "deploy"), - "hydra" + "hydra_wallet" ), }, }; diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 08011a0..3c2fd29 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -118,7 +118,7 @@ jobs: - run: mkdir -p target/deploy - run: cp -r tests/test-keypairs/* target/deploy - - run: find . -type f -name "*" -exec sed -i'' -e "s/hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg/$(solana-keygen pubkey tests/test-keypairs/hydra-keypair.json)/g" {} + + - run: find . -type f -name "*" -exec sed -i'' -e "s/hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg/$(solana-keygen pubkey tests/test-keypairs/hydra_wallet-keypair.json)/g" {} + - run: yarn build - run: anchor build diff --git a/Anchor.toml b/Anchor.toml index 6add97d..66ca2bf 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -1,11 +1,11 @@ [programs.localnet] -hydra = "hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg" +hydra_wallet = "hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg" [programs.devnet] -hydra = "hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg" +hydra_wallet = "hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg" [programs.mainnet] -hydra = "hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg" +hydra_wallet = "hyDQ4Nz1eYyegS6JfenyKwKzYxRsCWCriYSAjtzP4Vg" [registry] diff --git a/cli/hydra_cli/src/main.rs b/cli/hydra_cli/src/main.rs index 56046f9..9ede77b 100644 --- a/cli/hydra_cli/src/main.rs +++ b/cli/hydra_cli/src/main.rs @@ -8,7 +8,7 @@ use anchor_client::solana_client::rpc_config::{RpcAccountInfoConfig, RpcProgramA use anchor_client::solana_client::rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType}; use clap::{ArgMatches, Error, ErrorKind}; -use hydra::state::{Fanout, FanoutMint}; +use hydra_wallet::state::{Fanout, FanoutMint}; use solana_account_decoder::UiAccountEncoding; use solana_sdk::commitment_config::{CommitmentConfig, CommitmentLevel}; use solana_sdk::pubkey::Pubkey; @@ -75,7 +75,7 @@ fn main() { let get_hydra_mints = |rpc: RpcClient| { move |hydra_pub: Pubkey, _fanout: Fanout| { rpc.get_program_accounts_with_config( - &hydra::id(), + &hydra_wallet::id(), RpcProgramAccountsConfig { filters: Some(vec![RpcFilterType::Memcmp(Memcmp { offset: 40, diff --git a/programs/hydra/Cargo.toml b/programs/hydra/Cargo.toml index 20f9efb..490dcef 100644 --- a/programs/hydra/Cargo.toml +++ b/programs/hydra/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" [lib] crate-type = ["cdylib", "lib"] -name = "hydra" +name = "hydra_wallet" [features] no-entrypoint = [] diff --git a/tests/test-keypairs/hydra-keypair.json b/tests/test-keypairs/hydra_wallet-keypair.json similarity index 100% rename from tests/test-keypairs/hydra-keypair.json rename to tests/test-keypairs/hydra_wallet-keypair.json