blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove some low-hanging TODOs (#6839)

This commit is contained in:
Michael Vines 2019-11-08 16:41:36 -07:00 committed by GitHub
parent 151adab739
commit 9c00ad9ff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/rpc_pubsub.rs
View File

@ -11,7 +11,10 @@ use solana_sdk::signature::Signature;
use solana_sdk::transaction; use solana_sdk::transaction;
use std::sync::{atomic, Arc}; use std::sync::{atomic, Arc};
#[allow(clippy::needless_return)] // TODO remove me when rpc is updated? // Suppress needless_return due to
// https://github.com/paritytech/jsonrpc/blob/2d38e6424d8461cdf72e78425ce67d51af9c6586/derive/src/lib.rs#L204
// Once https://github.com/paritytech/jsonrpc/issues/418 is resolved, try to remove this clippy allow
#[allow(clippy::needless_return)]
#[rpc(server)] #[rpc(server)]
pub trait RpcSolPubSub { pub trait RpcSolPubSub {
type Metadata; type Metadata;
@ -376,7 +379,6 @@ mod tests {
let contract_funds = Keypair::new(); let contract_funds = Keypair::new();
let contract_state = Keypair::new(); let contract_state = Keypair::new();
let budget_program_id = solana_budget_api::id(); let budget_program_id = solana_budget_api::id();
let executable = false; // TODO
let bank = Bank::new(&genesis_block); let bank = Bank::new(&genesis_block);
let blockhash = bank.last_blockhash(); let blockhash = bank.last_blockhash();
let bank_forks = Arc::new(RwLock::new(BankForks::new(0, bank))); let bank_forks = Arc::new(RwLock::new(BankForks::new(0, bank)));
@ -428,7 +430,7 @@ mod tests {
"owner": budget_program_id, "owner": budget_program_id,
"lamports": 51, "lamports": 51,
"data": expected_data, "data": expected_data,
"executable": executable, "executable": false,
"rent_epoch": 0, "rent_epoch": 0,
}, },
"subscription": 0, "subscription": 0,

6
metrics/src/metrics.rs
View File

@ -438,11 +438,7 @@ pub fn set_panic_hook(program: &'static str) {
// The 'one' field exists to give Kapacitor Alerts a numerical value // The 'one' field exists to give Kapacitor Alerts a numerical value
// to filter on // to filter on
.add_field_i64("one", 1) .add_field_i64("one", 1)
.add_field_str( .add_field_str("message", &ono.to_string())
"message",
// TODO: use ono.message() when it becomes stable
&ono.to_string(),
)
.add_field_str("location", &location) .add_field_str("location", &location)
.to_owned(), .to_owned(),
Level::Error, Level::Error,

1
net/gce.sh
View File

@ -36,7 +36,6 @@ azure)
# shellcheck source=net/scripts/azure-provider.sh # shellcheck source=net/scripts/azure-provider.sh
source "$here"/scripts/azure-provider.sh source "$here"/scripts/azure-provider.sh
# TODO: Dial in machine types for Azure
cpuBootstrapLeaderMachineType=Standard_D16s_v3 cpuBootstrapLeaderMachineType=Standard_D16s_v3
gpuBootstrapLeaderMachineType=Standard_NC12 gpuBootstrapLeaderMachineType=Standard_NC12
clientMachineType=Standard_D16s_v3 clientMachineType=Standard_D16s_v3

11
net/scripts/colo-provider.sh
View File

@ -5,7 +5,8 @@
# Utilities for working with Colo instances # Utilities for working with Colo instances
# #
declare COLO_TODO_PARALLELIZE=false # COLO_PARALLELIZE is not ready for use, disable it
declare COLO_PARALLELIZE=false
__cloud_colo_here="$(dirname "${BASH_SOURCE[0]}")" __cloud_colo_here="$(dirname "${BASH_SOURCE[0]}")"
# shellcheck source=net/scripts/colo-utils.sh # shellcheck source=net/scripts/colo-utils.sh
@ -40,7 +41,7 @@ __cloud_FindInstances() {
declare filter=$1 declare filter=$1
instances=() instances=()
if ! $COLO_TODO_PARALLELIZE; then if ! $COLO_PARALLELIZE; then
colo_load_resources colo_load_resources
colo_load_availability false colo_load_availability false
fi fi
@ -110,7 +111,7 @@ cloud_Initialize() {
# networkName=$1 # unused # networkName=$1 # unused
# zone=$2 #unused # zone=$2 #unused
colo_load_resources colo_load_resources
if $COLO_TODO_PARALLELIZE; then if $COLO_PARALLELIZE; then
colo_load_availability colo_load_availability
fi fi
} }
@ -166,7 +167,7 @@ cloud_CreateInstances() {
done done
fi fi
if $COLO_TODO_PARALLELIZE; then if $COLO_PARALLELIZE; then
declare HOST_NAME IP PRIV_IP STATUS ZONE LOCK_USER INSTNAME INDEX RES LINE declare HOST_NAME IP PRIV_IP STATUS ZONE LOCK_USER INSTNAME INDEX RES LINE
declare -a AVAILABLE declare -a AVAILABLE
declare AVAILABLE_TEXT declare AVAILABLE_TEXT
@ -270,7 +271,7 @@ cloud_FetchFile() {
cloud_StatusAll() { cloud_StatusAll() {
declare HOST_NAME IP PRIV_IP STATUS ZONE LOCK_USER INSTNAME declare HOST_NAME IP PRIV_IP STATUS ZONE LOCK_USER INSTNAME
if ! $COLO_TODO_PARALLELIZE; then if ! $COLO_PARALLELIZE; then
colo_load_resources colo_load_resources
colo_load_availability false colo_load_availability false
fi fi

6
net/scripts/colo-utils.sh
View File

@ -178,9 +178,9 @@ colo_node_status_all() {
done < <(colo_instance_run_foreach "$(__colo_node_status_script)") done < <(colo_instance_run_foreach "$(__colo_node_status_script)")
} }
# TODO: As part of COLO_TOOD_PARALLELIZE this list will need to be maintained # Note: As part of enabling COLO_PARALLELIZE, this list will need to be maintained in a
# in a lockfile to work around `cloud_CreateInstance` being called in the # lockfile to work around `cloud_CreateInstance` being called in the background
# background for validators # for validators
export COLO_RES_REQUISITIONED=() export COLO_RES_REQUISITIONED=()
colo_node_requisition() { colo_node_requisition() {
declare IP=$1 declare IP=$1

13
net/scripts/ec2-provider.sh
View File

@ -19,9 +19,7 @@ __cloud_GetRegion() {
echo "$region" echo "$region"
} }
# sshPrivateKey should be globally defined whenever this function is called. # Note: sshPrivateKey should be globally defined whenever this function is called.
#
# TODO: Remove usage of the sshPrivateKey global
__cloud_SshPrivateKeyCheck() { __cloud_SshPrivateKeyCheck() {
# shellcheck disable=SC2154 # shellcheck disable=SC2154
if [[ -z $sshPrivateKey ]]; then if [[ -z $sshPrivateKey ]]; then
@ -174,8 +172,8 @@ cloud_CreateInstances() {
# #
# Custom Ubuntu 18.04 LTS image with CUDA 9.2 and CUDA 10.0 installed # Custom Ubuntu 18.04 LTS image with CUDA 9.2 and CUDA 10.0 installed
# #
# TODO: Unfortunately these AMIs are not public. When this becomes an issue, # Unfortunately these AMIs are not public. When this becomes an issue, use
# use the stock Ubuntu 18.04 image and programmatically install CUDA after the # the stock Ubuntu 18.04 image and programmatically install CUDA after the
# instance boots # instance boots
# #
case $region in case $region in
@ -287,9 +285,10 @@ cloud_CreateInstances() {
IFS=: read -r instanceId publicIp privateIp zone < <(echo "${instances[0]}") IFS=: read -r instanceId publicIp privateIp zone < <(echo "${instances[0]}")
( (
set -x set -x
# TODO: Poll that the instance has moved to the 'running' state instead of # It would be better to poll that the instance has moved to the 'running'
# blindly sleeping for 30 seconds... # state instead of blindly sleeping for 30 seconds...
sleep 30 sleep 30
declare region= declare region=
region=$(__cloud_GetRegion "$zone") region=$(__cloud_GetRegion "$zone")
aws ec2 associate-address \ aws ec2 associate-address \

9
sdk/src/fee_calculator.rs
View File

@ -64,9 +64,6 @@ impl FeeCalculator {
if me.target_signatures_per_slot > 0 { if me.target_signatures_per_slot > 0 {
// lamports_per_signature can range from 50% to 1000% of // lamports_per_signature can range from 50% to 1000% of
// target_lamports_per_signature // target_lamports_per_signature
//
// TODO: Are these decent limits?
//
me.min_lamports_per_signature = std::cmp::max(1, me.target_lamports_per_signature / 2); me.min_lamports_per_signature = std::cmp::max(1, me.target_lamports_per_signature / 2);
me.max_lamports_per_signature = me.target_lamports_per_signature * 10; me.max_lamports_per_signature = me.target_lamports_per_signature * 10;
@ -91,10 +88,8 @@ impl FeeCalculator {
if gap == 0 { if gap == 0 {
me.lamports_per_signature = desired_lamports_per_signature; me.lamports_per_signature = desired_lamports_per_signature;
} else { } else {
// Adjust fee by 5% of target_lamports_per_signature to produce a smooth increase/decrease in fees over time. // Adjust fee by 5% of target_lamports_per_signature to produce a smooth
// // increase/decrease in fees over time.
// TODO: Is this fee curve smooth enough or too smooth?
//
let gap_adjust = let gap_adjust =
std::cmp::max(1, me.target_lamports_per_signature / 20) as i64 * gap.signum(); std::cmp::max(1, me.target_lamports_per_signature / 20) as i64 * gap.signum();