Skip to content

Commit c3dc12d

Browse files
tholopcopybara-github
tholop
authored and
copybara-github
committed
Organize by dependency order instead of abstraction layer.
PiperOrigin-RevId: 836370582
1 parent 7965712 commit c3dc12d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+794
-820
lines changed

‎willow/benches/BUILD‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,24 @@ rust_library(
2828
deps = [
2929
"@crate_index//:clap",
3030
"//willow/src/api:aggregation_config",
31-
"//willow/src/shell:kahe_shell",
32-
"//willow/src/shell:parameters_shell",
33-
"//willow/src/shell:single_thread_hkdf",
34-
"//willow/src/shell:vahe_shell",
31+
"//willow/src/crypto:ahe_traits",
32+
"//willow/src/crypto:kahe_traits",
33+
"//willow/src/crypto:prng_traits",
34+
"//willow/src/crypto:shell_kahe",
35+
"//willow/src/crypto:shell_parameters",
36+
"//willow/src/crypto:shell_vahe",
37+
"//willow/src/crypto:single_thread_hkdf",
38+
"//willow/src/crypto:vahe_traits",
39+
"//willow/src/protocol:client_traits",
40+
"//willow/src/protocol:decryptor_traits",
41+
"//willow/src/protocol:messages",
42+
"//willow/src/protocol:server_traits",
43+
"//willow/src/protocol:verifier_traits",
44+
"//willow/src/protocol:willow_v1_client",
45+
"//willow/src/protocol:willow_v1_decryptor",
46+
"//willow/src/protocol:willow_v1_server",
47+
"//willow/src/protocol:willow_v1_verifier",
3548
"//willow/src/testing_utils",
36-
"//willow/src/traits:ahe_traits",
37-
"//willow/src/traits:client_traits",
38-
"//willow/src/traits:decryptor_traits",
39-
"//willow/src/traits:kahe_traits",
40-
"//willow/src/traits:messages",
41-
"//willow/src/traits:prng_traits",
42-
"//willow/src/traits:server_traits",
43-
"//willow/src/traits:vahe_traits",
44-
"//willow/src/traits:verifier_traits",
45-
"//willow/src/willow_v1:willow_v1_client",
46-
"//willow/src/willow_v1:willow_v1_decryptor",
47-
"//willow/src/willow_v1:willow_v1_server",
48-
"//willow/src/willow_v1:willow_v1_verifier",
4949
],
5050
)
5151

‎willow/benches/shell_benchmarks.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ use aggregation_config::AggregationConfig;
2121
use ahe_traits::AheBase;
2222
use client_traits::SecureAggregationClient;
2323
use decryptor_traits::SecureAggregationDecryptor;
24-
use kahe_shell::ShellKahe;
2524
use kahe_traits::KaheBase;
2625
use messages::{
2726
CiphertextContribution, DecryptionRequestContribution, DecryptorPublicKey,
2827
PartialDecryptionRequest,
2928
};
30-
use parameters_shell::{create_shell_ahe_config, create_shell_kahe_config};
3129
use prng_traits::SecurePrng;
3230
use server_traits::SecureAggregationServer;
31+
use shell_kahe::ShellKahe;
32+
use shell_parameters::{create_shell_ahe_config, create_shell_kahe_config};
33+
use shell_vahe::ShellVahe;
3334
use single_thread_hkdf::SingleThreadHkdfPrng;
3435
use testing_utils::{generate_random_nonce, generate_random_unsigned_vector};
35-
use vahe_shell::ShellVahe;
3636
use verifier_traits::SecureAggregationVerifier;
3737
use willow_v1_client::WillowV1Client;
3838
use willow_v1_decryptor::{DecryptorState, WillowV1Decryptor};

‎willow/src/api/BUILD‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,27 @@ package(
2424
default_visibility = ["//visibility:public"],
2525
)
2626

27+
rust_library(
28+
name = "proto_serialization_traits",
29+
srcs = [
30+
"proto_serialization.rs",
31+
],
32+
deps = [
33+
"@protobuf//rust:protobuf",
34+
"//shell_wrapper:status",
35+
],
36+
)
37+
2738
rust_library(
2839
name = "aggregation_config",
2940
srcs = [
3041
"aggregation_config.rs",
3142
],
3243
deps = [
44+
":proto_serialization_traits",
3345
"@protobuf//rust:protobuf",
3446
"//shell_wrapper:status",
3547
"//willow/proto/willow:aggregation_config_rust_proto",
36-
"//willow/src/traits:proto_serialization_traits",
3748
],
3849
)
3950

@@ -97,17 +108,17 @@ rust_library(
97108
"//shell_wrapper:status",
98109
"//willow/proto/willow:aggregation_config_rust_proto",
99110
"//willow/proto/willow:server_accumulator_rust_proto",
100-
"//willow/src/shell:kahe_shell",
101-
"//willow/src/shell:parameters_shell",
102-
"//willow/src/shell:vahe_shell",
103-
"//willow/src/traits:ahe_traits",
104-
"//willow/src/traits:kahe_traits",
105-
"//willow/src/traits:messages",
106-
"//willow/src/traits:proto_serialization_traits",
107-
"//willow/src/traits:server_traits",
108-
"//willow/src/traits:vahe_traits",
109-
"//willow/src/traits:verifier_traits",
110-
"//willow/src/willow_v1:willow_v1_server",
111-
"//willow/src/willow_v1:willow_v1_verifier",
111+
"//willow/src/crypto:ahe_traits",
112+
"//willow/src/crypto:kahe_traits",
113+
"//willow/src/crypto:shell_kahe",
114+
"//willow/src/crypto:shell_parameters",
115+
"//willow/src/crypto:shell_vahe",
116+
"//willow/src/crypto:vahe_traits",
117+
"//willow/src/protocol:messages",
118+
"//willow/src/protocol:server_traits",
119+
"//willow/src/protocol:verifier_traits",
120+
"//willow/src/protocol:willow_v1_server",
121+
"//willow/src/protocol:willow_v1_verifier",
122+
":proto_serialization_traits",
112123
],
113124
)

willow/src/traits/proto_serialization.rs renamed to willow/src/api/proto_serialization.rs

File renamed without changes.

‎willow/src/api/server_accumulator.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
use aggregation_config::AggregationConfig;
1616
use aggregation_config_rust_proto::AggregationConfigProto;
1717
use ahe_traits::AheBase;
18-
use kahe_shell::ShellKahe;
1918
use kahe_traits::KaheBase;
2019
use messages::ClientMessage;
21-
use parameters_shell::{create_shell_ahe_config, create_shell_kahe_config};
2220
use proto_serialization_traits::{FromProto, ToProto};
2321
use protobuf::prelude::*;
2422
use protobuf::AsView;
2523
use server_accumulator_rust_proto::{ClientMessageList, ServerAccumulatorState};
2624
use server_traits::SecureAggregationServer;
25+
use shell_kahe::ShellKahe;
26+
use shell_parameters::{create_shell_ahe_config, create_shell_kahe_config};
27+
use shell_vahe::ShellVahe;
2728
use status::StatusError;
28-
use vahe_shell::ShellVahe;
2929
use verifier_traits::SecureAggregationVerifier;
3030
use willow_v1_server::{ServerState, WillowV1Server};
3131
use willow_v1_verifier::{VerifierState, WillowV1Verifier};

0 commit comments

Comments
 (0)