From 35e138306b934603b2acd2adfa8fe9c0814294bd Mon Sep 17 00:00:00 2001 From: armaniferrante Date: Fri, 9 Apr 2021 10:31:45 -0700 Subject: [PATCH 1/2] cli: Fund configured wallet when testing --- cli/src/config.rs | 6 ++++++ cli/src/main.rs | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cli/src/config.rs b/cli/src/config.rs index bc9b85c370..bbc2961e54 100644 --- a/cli/src/config.rs +++ b/cli/src/config.rs @@ -2,6 +2,7 @@ use anchor_syn::idl::Idl; use anyhow::{anyhow, Error, Result}; use serde::{Deserialize, Serialize}; use serum_common::client::Cluster; +use solana_sdk::signature::Keypair; use std::fs::{self, File}; use std::io::prelude::*; use std::path::Path; @@ -58,6 +59,11 @@ impl Config { Ok(None) } + + pub fn wallet_kp(&self) -> Result { + solana_sdk::signature::read_keypair_file(&self.wallet.to_string()) + .map_err(|_| anyhow!("Unable to read keypair file")) + } } // Pubkey serializes as a byte array so use this type a hack to serialize diff --git a/cli/src/main.rs b/cli/src/main.rs index 83c32e7bf2..4b8440b3d8 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -909,7 +909,7 @@ fn test(skip_deploy: bool, skip_local_validator: bool, file: Option) -> }; match skip_local_validator { true => None, - false => Some(start_test_validator(flags)?), + false => Some(start_test_validator(cfg, flags)?), } } _ => { @@ -1058,7 +1058,7 @@ pub struct IdlTestMetadata { address: String, } -fn start_test_validator(flags: Option>) -> Result { +fn start_test_validator(cfg: &Config, flags: Option>) -> Result { fs::create_dir_all(".anchor")?; let test_ledger_filename = ".anchor/test-ledger"; let test_ledger_log_filename = ".anchor/test-ledger-log.txt"; @@ -1076,6 +1076,8 @@ fn start_test_validator(flags: Option>) -> Result { let validator_handle = std::process::Command::new("solana-test-validator") .arg("--ledger") .arg(test_ledger_filename) + .arg("--mint") + .arg(cfg.wallet_kp()?.pubkey().to_string()) .args(flags.unwrap_or_default()) .stdout(Stdio::from(test_validator_stdout)) .stderr(Stdio::from(test_validator_stderr)) From 821472bb27b395ce6361fdba6dd0f7778fdcc264 Mon Sep 17 00:00:00 2001 From: armaniferrante Date: Fri, 9 Apr 2021 10:33:38 -0700 Subject: [PATCH 2/2] Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb40574703..442f0e3ec0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ incremented for features. ## [Unreleased] +## Features + +* cli: Fund Anchor.toml configured wallet when testing ([#164](https://github.com/project-serum/anchor/pull/164)). + ## [0.4.1] - 2021-04-06 * cli: Version verifiable docker builder ([#145](https://github.com/project-serum/anchor/pull/145)).