From b1ccc0834955e939901678d99278baee432465ef Mon Sep 17 00:00:00 2001 From: ananas-block Date: Fri, 28 Jun 2024 22:51:47 +0100 Subject: [PATCH] chore: remove clone from --- Cargo.lock | 100 ++++++++++++++--------------- merkle-tree/bounded-vec/src/lib.rs | 57 ---------------- 2 files changed, 50 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a746fe1cd4..aead9e9ee9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5140,7 +5140,7 @@ dependencies = [ [[package]] name = "solana-account-decoder" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "Inflector", "base64 0.21.7", @@ -5164,7 +5164,7 @@ dependencies = [ [[package]] name = "solana-accounts-db" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "arrayref", "bincode", @@ -5224,7 +5224,7 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bincode", "bytemuck", @@ -5244,7 +5244,7 @@ dependencies = [ [[package]] name = "solana-banks-client" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "borsh 1.4.0", "futures", @@ -5260,7 +5260,7 @@ dependencies = [ [[package]] name = "solana-banks-interface" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "serde", "solana-sdk", @@ -5270,7 +5270,7 @@ dependencies = [ [[package]] name = "solana-banks-server" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bincode", "crossbeam-channel", @@ -5289,7 +5289,7 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bincode", "byteorder", @@ -5307,7 +5307,7 @@ dependencies = [ [[package]] name = "solana-bucket-map" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bv", "bytemuck", @@ -5324,7 +5324,7 @@ dependencies = [ [[package]] name = "solana-clap-utils" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "chrono", "clap 2.34.0", @@ -5340,7 +5340,7 @@ dependencies = [ [[package]] name = "solana-cli-config" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "dirs-next", "lazy_static", @@ -5355,7 +5355,7 @@ dependencies = [ [[package]] name = "solana-cli-output" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "Inflector", "base64 0.21.7", @@ -5381,7 +5381,7 @@ dependencies = [ [[package]] name = "solana-client" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "async-trait", "bincode", @@ -5413,7 +5413,7 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -5422,7 +5422,7 @@ dependencies = [ [[package]] name = "solana-config-program" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bincode", "chrono", @@ -5435,7 +5435,7 @@ dependencies = [ [[package]] name = "solana-connection-cache" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "async-trait", "bincode", @@ -5456,7 +5456,7 @@ dependencies = [ [[package]] name = "solana-cost-model" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "lazy_static", "log", @@ -5479,7 +5479,7 @@ dependencies = [ [[package]] name = "solana-frozen-abi" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "block-buffer 0.10.4", "bs58 0.4.0", @@ -5503,7 +5503,7 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "proc-macro2", "quote", @@ -5514,7 +5514,7 @@ dependencies = [ [[package]] name = "solana-loader-v4-program" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "log", "solana-measure", @@ -5526,7 +5526,7 @@ dependencies = [ [[package]] name = "solana-logger" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "env_logger 0.9.3", "lazy_static", @@ -5536,7 +5536,7 @@ dependencies = [ [[package]] name = "solana-measure" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "log", "solana-sdk", @@ -5545,7 +5545,7 @@ dependencies = [ [[package]] name = "solana-metrics" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "crossbeam-channel", "gethostname", @@ -5559,7 +5559,7 @@ dependencies = [ [[package]] name = "solana-net-utils" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bincode", "clap 3.2.25", @@ -5586,7 +5586,7 @@ checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" [[package]] name = "solana-perf" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "ahash 0.8.11", "bincode", @@ -5614,7 +5614,7 @@ dependencies = [ [[package]] name = "solana-program" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "ark-bn254", "ark-ec", @@ -5668,7 +5668,7 @@ dependencies = [ [[package]] name = "solana-program-runtime" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "base64 0.21.7", "bincode", @@ -5695,7 +5695,7 @@ dependencies = [ [[package]] name = "solana-program-test" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "assert_matches", "async-trait", @@ -5724,7 +5724,7 @@ dependencies = [ [[package]] name = "solana-pubsub-client" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "crossbeam-channel", "futures-util", @@ -5748,7 +5748,7 @@ dependencies = [ [[package]] name = "solana-quic-client" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "async-mutex", "async-trait", @@ -5774,7 +5774,7 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "lazy_static", "num_cpus", @@ -5783,7 +5783,7 @@ dependencies = [ [[package]] name = "solana-remote-wallet" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "console", "dialoguer", @@ -5801,7 +5801,7 @@ dependencies = [ [[package]] name = "solana-rpc-client" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "async-trait", "base64 0.21.7", @@ -5826,7 +5826,7 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "base64 0.21.7", "bs58 0.4.0", @@ -5847,7 +5847,7 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -5859,7 +5859,7 @@ dependencies = [ [[package]] name = "solana-runtime" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "aquamarine", "arrayref", @@ -5935,7 +5935,7 @@ dependencies = [ [[package]] name = "solana-sdk" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "assert_matches", "base64 0.21.7", @@ -5989,7 +5989,7 @@ dependencies = [ [[package]] name = "solana-sdk-macro" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bs58 0.4.0", "proc-macro2", @@ -6007,7 +6007,7 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-send-transaction-service" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "crossbeam-channel", "log", @@ -6022,7 +6022,7 @@ dependencies = [ [[package]] name = "solana-stake-program" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bincode", "log", @@ -6036,7 +6036,7 @@ dependencies = [ [[package]] name = "solana-streamer" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "async-channel", "bytes", @@ -6068,7 +6068,7 @@ dependencies = [ [[package]] name = "solana-system-program" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bincode", "log", @@ -6081,7 +6081,7 @@ dependencies = [ [[package]] name = "solana-thin-client" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bincode", "log", @@ -6095,7 +6095,7 @@ dependencies = [ [[package]] name = "solana-tpu-client" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "async-trait", "bincode", @@ -6118,7 +6118,7 @@ dependencies = [ [[package]] name = "solana-transaction-status" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "Inflector", "base64 0.21.7", @@ -6142,7 +6142,7 @@ dependencies = [ [[package]] name = "solana-udp-client" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "async-trait", "solana-connection-cache", @@ -6156,7 +6156,7 @@ dependencies = [ [[package]] name = "solana-version" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "log", "rustc_version", @@ -6171,7 +6171,7 @@ dependencies = [ [[package]] name = "solana-vote" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "crossbeam-channel", "itertools", @@ -6189,7 +6189,7 @@ dependencies = [ [[package]] name = "solana-vote-program" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bincode", "log", @@ -6210,7 +6210,7 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "bytemuck", "num-derive 0.4.2", @@ -6223,7 +6223,7 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" version = "1.18.11" -source = "git+https://github.com/Lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" +source = "git+https://github.com/lightprotocol/agave?branch=v1.18.11-enforce-cpi-tracking#a24d3c07e25de696b4922ddde3e69877e8e9fa27" dependencies = [ "aes-gcm-siv", "base64 0.21.7", diff --git a/merkle-tree/bounded-vec/src/lib.rs b/merkle-tree/bounded-vec/src/lib.rs index e1632bad9a..333126199e 100644 --- a/merkle-tree/bounded-vec/src/lib.rs +++ b/merkle-tree/bounded-vec/src/lib.rs @@ -370,34 +370,6 @@ where new_vec } - - fn clone_from(&mut self, source: &Self) { - if self.capacity() != source.capacity() { - // Otherwise, reallocate the vector to new capacity. - - let old_layout = Layout::array::(self.capacity()).unwrap(); - let new_layout = Layout::array::(source.capacity()).unwrap(); - let new_ptr = unsafe { - alloc::realloc(self.data.as_ptr() as *mut u8, old_layout, new_layout.size()) - as *mut T - }; - if new_ptr.is_null() { - handle_alloc_error(new_layout); - } - self.data = NonNull::new(new_ptr).unwrap(); - unsafe { (*self.metadata).capacity = source.capacity() }; - } - - // Copy all elements from `source` and update the length. - for i in 0..source.len() { - // SAFETY: `length` is guaranteed to be lower than `capacity`, - // if `BoundedVec` was created safely. - unsafe { ptr::write(self.data.as_ptr().add(i), (*source.get(i).unwrap()).clone()) }; - } - // SAFETY: `self.metadata` should be initialized if `BoundedVec` - // was created safely. - unsafe { (*self.metadata).length = source.len() }; - } } impl fmt::Debug for BoundedVec @@ -1193,35 +1165,6 @@ mod test { } } - #[test] - fn test_bounded_vec_clone_from_equal_capacity() { - for _ in 0..1000 { - let bounded_vec = rand_bounded_vec::(); - let mut cloned_bounded_vec = BoundedVec::with_capacity(bounded_vec.capacity()); - cloned_bounded_vec.clone_from(&bounded_vec); - - assert_eq!(bounded_vec.capacity(), cloned_bounded_vec.capacity()); - assert_eq!(bounded_vec.len(), cloned_bounded_vec.len()); - assert_eq!(bounded_vec, cloned_bounded_vec); - } - } - - #[test] - fn test_bounded_vec_clone_from_non_unequal_capacity() { - let mut rng = rand::thread_rng(); - - for _ in 0..1000 { - let bounded_vec = rand_bounded_vec::(); - let rand_capacity = gen_range_exclude(&mut rng, 1..1000, &[bounded_vec.capacity()]); - let mut cloned_bounded_vec = BoundedVec::with_capacity(rand_capacity); - cloned_bounded_vec.clone_from(&bounded_vec); - - assert_eq!(bounded_vec.capacity(), cloned_bounded_vec.capacity()); - assert_eq!(bounded_vec.len(), cloned_bounded_vec.len()); - assert_eq!(bounded_vec, cloned_bounded_vec); - } - } - #[test] fn test_bounded_vec_index() { let mut vec = BoundedVec::with_capacity(1000);