Skip to content

Organize by dependency order instead of abstraction layer. #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Organize by dependency order instead of abstraction layer. #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions willow/benches/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@ rust_library(
deps = [
"@crate_index//:clap",
"//willow/src/api:aggregation_config",
"//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",
],
)

Expand Down
6 changes: 3 additions & 3 deletions willow/benches/shell_benchmarks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ use aggregation_config::AggregationConfig;
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_ahe_config, create_shell_kahe_config};
use prng_traits::SecurePrng;
use server_traits::SecureAggregationServer;
use shell_kahe::ShellKahe;
use shell_parameters::{create_shell_ahe_config, create_shell_kahe_config};
use shell_vahe::ShellVahe;
use single_thread_hkdf::SingleThreadHkdfPrng;
use testing_utils::{generate_random_nonce, generate_random_unsigned_vector};
use vahe_shell::ShellVahe;
use verifier_traits::SecureAggregationVerifier;
use willow_v1_client::WillowV1Client;
use willow_v1_decryptor::{DecryptorState, WillowV1Decryptor};
Expand Down
37 changes: 24 additions & 13 deletions willow/src/api/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,27 @@ package(
default_visibility = ["//visibility:public"],
)

rust_library(
name = "proto_serialization_traits",
srcs = [
"proto_serialization.rs",
],
deps = [
"@protobuf//rust:protobuf",
"//shell_wrapper:status",
],
)

rust_library(
name = "aggregation_config",
srcs = [
"aggregation_config.rs",
],
deps = [
":proto_serialization_traits",
"@protobuf//rust:protobuf",
"//shell_wrapper:status",
"//willow/proto/willow:aggregation_config_rust_proto",
"//willow/src/traits:proto_serialization_traits",
],
)

Expand Down Expand Up @@ -97,17 +108,17 @@ rust_library(
"//shell_wrapper:status",
"//willow/proto/willow:aggregation_config_rust_proto",
"//willow/proto/willow:server_accumulator_rust_proto",
"//willow/src/shell:kahe_shell",
"//willow/src/shell:parameters_shell",
"//willow/src/shell:vahe_shell",
"//willow/src/traits:ahe_traits",
"//willow/src/traits:kahe_traits",
"//willow/src/traits:messages",
"//willow/src/traits:proto_serialization_traits",
"//willow/src/traits:server_traits",
"//willow/src/traits:vahe_traits",
"//willow/src/traits:verifier_traits",
"//willow/src/willow_v1:willow_v1_server",
"//willow/src/willow_v1:willow_v1_verifier",
"//willow/src/crypto:ahe_traits",
"//willow/src/crypto:kahe_traits",
"//willow/src/crypto:shell_kahe",
"//willow/src/crypto:shell_parameters",
"//willow/src/crypto:shell_vahe",
"//willow/src/crypto:vahe_traits",
"//willow/src/protocol:messages",
"//willow/src/protocol:server_traits",
"//willow/src/protocol:verifier_traits",
"//willow/src/protocol:willow_v1_server",
"//willow/src/protocol:willow_v1_verifier",
":proto_serialization_traits",
],
)
0 willow/src/traits/proto_serialization.rs → willow/src/api/proto_serialization.rs
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions willow/src/api/server_accumulator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
use aggregation_config::AggregationConfig;
use aggregation_config_rust_proto::AggregationConfigProto;
use ahe_traits::AheBase;
use kahe_shell::ShellKahe;
use kahe_traits::KaheBase;
use messages::ClientMessage;
use parameters_shell::{create_shell_ahe_config, create_shell_kahe_config};
use proto_serialization_traits::{FromProto, ToProto};
use protobuf::prelude::*;
use protobuf::AsView;
use server_accumulator_rust_proto::{ClientMessageList, ServerAccumulatorState};
use server_traits::SecureAggregationServer;
use shell_kahe::ShellKahe;
use shell_parameters::{create_shell_ahe_config, create_shell_kahe_config};
use shell_vahe::ShellVahe;
use status::StatusError;
use vahe_shell::ShellVahe;
use verifier_traits::SecureAggregationVerifier;
use willow_v1_server::{ServerState, WillowV1Server};
use willow_v1_verifier::{VerifierState, WillowV1Verifier};
Expand Down
Loading