Organize by dependency order instead of abstraction layer.

PiperOrigin-RevId: 836370582

Author: tholop

willow/benches/BUILD

@@ -28,24 +28,24 @@ rust_library(
     deps = [
         "@crate_index//:clap",
         "//willow/src/api:willow_api_common",
-        "//willow/src/shell:kahe_shell",
-        "//willow/src/shell:parameters_shell",
-        "//willow/src/shell:single_thread_hkdf",
-        "//willow/src/shell:vahe_shell",
+        "//willow/src/crypto:ahe_traits",
+        "//willow/src/crypto:kahe_traits",
+        "//willow/src/crypto:prng_traits",
+        "//willow/src/crypto:shell_kahe",
+        "//willow/src/crypto:shell_parameters",
+        "//willow/src/crypto:shell_vahe",
+        "//willow/src/crypto:single_thread_hkdf",
+        "//willow/src/crypto:vahe_traits",
+        "//willow/src/protocol:client_traits",
+        "//willow/src/protocol:decryptor_traits",
+        "//willow/src/protocol:messages",
+        "//willow/src/protocol:server_traits",
+        "//willow/src/protocol:verifier_traits",
+        "//willow/src/protocol:willow_v1_client",
+        "//willow/src/protocol:willow_v1_decryptor",
+        "//willow/src/protocol:willow_v1_server",
+        "//willow/src/protocol:willow_v1_verifier",
         "//willow/src/testing_utils",
-        "//willow/src/traits:ahe_traits",
-        "//willow/src/traits:client_traits",
-        "//willow/src/traits:decryptor_traits",
-        "//willow/src/traits:kahe_traits",
-        "//willow/src/traits:messages",
-        "//willow/src/traits:prng_traits",
-        "//willow/src/traits:server_traits",
-        "//willow/src/traits:vahe_traits",
-        "//willow/src/traits:verifier_traits",
-        "//willow/src/willow_v1:willow_v1_client",
-        "//willow/src/willow_v1:willow_v1_decryptor",
-        "//willow/src/willow_v1:willow_v1_server",
-        "//willow/src/willow_v1:willow_v1_verifier",
     ],
 )
 

willow/benches/shell_benchmarks.rs

@@ -20,18 +20,18 @@ use std::time::Duration;
 use ahe_traits::AheBase;
 use client_traits::SecureAggregationClient;
 use decryptor_traits::SecureAggregationDecryptor;
-use kahe_shell::ShellKahe;
 use kahe_traits::KaheBase;
 use messages::{
     CiphertextContribution, DecryptionRequestContribution, DecryptorPublicKey,
     PartialDecryptionRequest,
 };
-use parameters_shell::create_shell_configs;
 use prng_traits::SecurePrng;
 use server_traits::SecureAggregationServer;
+use shell_kahe::ShellKahe;
+use shell_parameters::create_shell_configs;
+use shell_vahe::ShellVahe;
 use single_thread_hkdf::SingleThreadHkdfPrng;
 use testing_utils::generate_random_unsigned_vector;
-use vahe_shell::ShellVahe;
 use verifier_traits::SecureAggregationVerifier;
 use willow_api_common::AggregationConfig;
 use willow_v1_client::WillowV1Client;