chore: rename nillion-chain-node to nilchain-node for consistency

mfontanini · mfontanini · commit 06919ae94c0b · 2025-06-03T14:26:35.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ members = [
     "libs/threshold-keypair",
     "libs/nada-values-args",
     "libs/client-metrics",
-    "libs/nillion-chain/node",
+    "libs/nilchain-node",
     "nada-lang/compiler-backend",
     "nada-lang/compiler-backend-tests",
     "nada-lang/pynadac",
diff --git a/client/src/lib.rs b/client/src/lib.rs
@@ -26,5 +26,5 @@ pub use nilchain_client::transactions::TokenAmount;
 pub use nillion_client_core::values::{Clear, NadaType, NadaValue};
 pub use node_api::auth::rust::UserId;
 pub use tonic::async_trait;
-pub use user_keypair::{SigningKey, ed25519::*, secp256k1::*};
+pub use user_keypair::{ed25519::*, secp256k1::*, SigningKey};
 pub use uuid::Uuid;
diff --git a/client/src/operation/add_funds.rs b/client/src/operation/add_funds.rs
@@ -4,9 +4,9 @@ use super::{BuildError, InitialState, InitialStateInvokeError, InvokeError, Paym
 use crate::{payments::TxHash, vm::VmClient};
 use nilchain_client::transactions::TokenAmount;
 use node_api::{
-    ConvertProto, Message,
     auth::rust::UserId,
     payments::rust::{AddFundsPayload, AddFundsRequest},
+    ConvertProto, Message,
 };
 use rand::random;
 use sha2::{Digest, Sha256};
diff --git a/client/src/operation/mod.rs b/client/src/operation/mod.rs
@@ -10,13 +10,13 @@ use nada_value::protobuf::nada_values_to_protobuf;
 use nilchain_client::transactions::TokenAmount;
 use nillion_client_core::values::{EncryptedValues, PartyId, PartyShares};
 use node_api::{
-    ConvertProto, Message,
     errors::StatusExt,
     payments::rust::{PaymentReceiptRequest, PriceQuote, PriceQuoteRequest, QuoteFees, SignedQuote, SignedReceipt},
     values::rust::NamedValue,
+    ConvertProto, Message,
 };
 use std::{any::type_name, fmt, time::Instant};
-use tonic::{Status, async_trait};
+use tonic::{async_trait, Status};
 use tracing::{info, instrument, warn};
 
 pub mod add_funds;
diff --git a/libs/nilchain-node/Cargo.toml b/libs/nilchain-node/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "nillion-chain-node"
+name = "nilchain-node"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/libs/nilchain-node/build.rs b/libs/nilchain-node/build.rs
diff --git a/libs/nilchain-node/examples/local.rs b/libs/nilchain-node/examples/local.rs
@@ -1,5 +1,5 @@
 use clap::Parser;
-use nillion_chain_node::{
+use nilchain_node::{
     node::{GenesisAccount, NillionChainNodeBuilder},
     transactions::TokenAmount,
 };
diff --git a/libs/nilchain-node/src/lib.rs b/libs/nilchain-node/src/lib.rs
diff --git a/libs/nilchain-node/src/node.rs b/libs/nilchain-node/src/node.rs
@@ -1,4 +1,4 @@
-use anyhow::{Context, Result, anyhow};
+use anyhow::{anyhow, Context, Result};
 use nilchain_client::{key::NillionChainPrivateKey, transactions::TokenAmount};
 use std::{
     env,
diff --git a/node/src/builder.rs b/node/src/builder.rs
@@ -17,7 +17,7 @@ use crate::{
         interceptors::{InternalServiceInterceptor, RateLimitInterceptor},
         metrics::MetricsMiddleware,
     },
-    observability::{PrometheusExporter, process::ProcessMetricsCollector},
+    observability::{process::ProcessMetricsCollector, PrometheusExporter},
     services::{
         auxiliary_material::{
             AuxiliaryMaterialMetadataService, AuxiliaryMaterialService, DefaultAuxiliaryMaterialMetadataService,
@@ -44,8 +44,8 @@ use crate::{
         auxiliary_material_scheduler::AuxiliaryMaterialScheduler,
         builder::{DefaultPrimeBuilder, PrimeBuilder},
         cleanup::{
-            ExpiredValuesCleanup, NonceCleanup, UsedPreprocessingCleanup, balances::BalancesCleanup,
-            compute_results::ExpiredComputeResultsCleanup,
+            balances::BalancesCleanup, compute_results::ExpiredComputeResultsCleanup, ExpiredValuesCleanup,
+            NonceCleanup, UsedPreprocessingCleanup,
         },
         preprocessing_scheduler::{PreprocessingScheduler, PreprocessingSchedulerServices},
     },
@@ -65,13 +65,13 @@ use crate::{
         sqlite::SqliteDb,
     },
 };
-use anyhow::{Context, Error, anyhow};
+use anyhow::{anyhow, Context, Error};
 use basic_types::PartyId;
 use chrono::Days;
 use futures::executor::block_on;
 use governor::Quota;
 use grpc_channel::auth::ServerAuthInterceptor;
-use math_lib::modular::{EncodedModularNumber, U64SafePrime, U128SafePrime, U256SafePrime};
+use math_lib::modular::{EncodedModularNumber, U128SafePrime, U256SafePrime, U64SafePrime};
 use mpc_vm::vm::ExecutionVmConfig;
 use nilchain_client::tx::{DefaultPaymentTransactionRetriever, PaymentTransactionRetriever};
 use node_api::{
@@ -93,8 +93,8 @@ use node_config::{
     PrivateKeyConfig, RateLimitBucket,
 };
 use object_store::{
+    aws::{resolve_bucket_region, AmazonS3, AmazonS3Builder, AmazonS3ConfigKey, S3ConditionalPut},
     ClientOptions,
-    aws::{AmazonS3, AmazonS3Builder, AmazonS3ConfigKey, S3ConditionalPut, resolve_bucket_region},
 };
 use program_auditor::ProgramAuditor;
 use protocols::{
@@ -105,15 +105,15 @@ use protocols::{
     },
     division::{
         division_secret_divisor::offline::EncodedPrepDivisionIntegerSecretShares,
-        modulo_public_divisor::offline::EncodedPrepModuloShares,
         modulo2m_public_divisor::offline::EncodedPrepModulo2mShares,
+        modulo_public_divisor::offline::EncodedPrepModuloShares,
         truncation_probabilistic::offline::EncodedPrepTruncPrShares,
     },
     random::random_bit::EncodedBitShare,
     threshold_ecdsa::auxiliary_information::output::EcdsaAuxInfo,
 };
-use rust_decimal::{Decimal, prelude::FromPrimitive};
-use serde::{Serialize, de::DeserializeOwned};
+use rust_decimal::{prelude::FromPrimitive, Decimal};
+use serde::{de::DeserializeOwned, Serialize};
 use shamir_sharing::secret_sharer::ShamirSecretSharer;
 use std::{collections::HashMap, fs, path::PathBuf, sync::Arc, time::Duration};
 use strum::IntoEnumIterator;
@@ -123,16 +123,16 @@ use tonic::{
     codegen::InterceptedService,
     transport::{Identity, ServerTlsConfig},
 };
-use tonic_health::{ServingStatus, pb::FILE_DESCRIPTOR_SET as TONIC_HEALTH_DESCRIPTOR, server::health_reporter};
+use tonic_health::{pb::FILE_DESCRIPTOR_SET as TONIC_HEALTH_DESCRIPTOR, server::health_reporter, ServingStatus};
 use tonic_middleware::MiddlewareLayer;
 use tonic_reflection::server::Builder as ReflectionBuilder;
 use tonic_web::GrpcWebLayer;
 use tower_http::cors::CorsLayer;
 use tracing::{error, info, warn};
 use user_keypair::{
-    SigningKey,
     ed25519::{Ed25519PublicKey, Ed25519SigningKey},
     secp256k1::{Secp256k1PublicKey, Secp256k1SigningKey},
+    SigningKey,
 };
 
 const GRACEFUL_SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(300);
diff --git a/node/src/main.rs b/node/src/main.rs
@@ -24,9 +24,9 @@ use node_config::Config;
 use std::path::PathBuf;
 use tokio::{
     select,
-    signal::unix::{SignalKind, signal},
+    signal::unix::{signal, SignalKind},
 };
-use tracing::{Instrument, error, info, info_span};
+use tracing::{error, info, info_span, Instrument};
 
 /// The Nillion node.
 #[derive(Parser)]
diff --git a/node/src/services/payments.rs b/node/src/services/payments.rs
@@ -5,7 +5,6 @@ use super::{
     time::TimeService,
 };
 use crate::{
-    PreprocessingConfigExt,
     services::token_dollar_conversion::{TokenDollarConversionError, TokenDollarConversionService},
     storage::{
         models::program::{ParseProgramIdError, ProgramId},
@@ -16,6 +15,7 @@ use crate::{
         },
         sqlite::{DatabaseError, TransactionContext},
     },
+    PreprocessingConfigExt,
 };
 use anyhow::anyhow;
 use axum::async_trait;
@@ -26,7 +26,6 @@ use nilchain_client::{
     tx::{PaymentTransactionRetriever, RetrieveError},
 };
 use node_api::{
-    ConvertProto, Message,
     auth::rust::{PublicKey, UserId},
     compute::{TECDSA_DKG_PROGRAM_ID, TEDDSA_DKG_PROGRAM_ID},
     payments::rust::{
@@ -35,12 +34,13 @@ use node_api::{
         SelectedAuxiliaryMaterial, SelectedPreprocessingOffsets, SignedQuote, SignedReceipt,
     },
     preprocessing::rust::{AuxiliaryMaterial, PreprocessingElement},
+    ConvertProto, Message,
 };
 use node_config::{PreprocessingConfig, PricingConfig};
 use once_cell::sync::Lazy;
 use program_auditor::ProgramAuditorRequest;
 use rand::random;
-use rust_decimal::{Decimal, prelude::ToPrimitive};
+use rust_decimal::{prelude::ToPrimitive, Decimal};
 use sha2::{Digest, Sha256};
 use std::{collections::HashSet, fmt, ops::Add, sync::Arc, time::Duration};
 use tracing::{error, info, warn};
diff --git a/tests/fixtures/nodes/Cargo.toml b/tests/fixtures/nodes/Cargo.toml
@@ -25,7 +25,7 @@ serde-files-utils = { path = "../../../libs/serde-files-utils", default-features
     "yaml",
 ] }
 tracing-fixture = { path = "../tracing" }
-nillion-chain-node = { path = "../../../libs/nillion-chain/node" }
+nilchain-node = { path = "../../../libs/nilchain-node" }
 nilchain-client = { workspace = true }
 grpc-channel = { path = "../../../libs/grpc-channel" }
 nillion-client = { path = "../../../client" }
diff --git a/tests/fixtures/nodes/src/nodes.rs b/tests/fixtures/nodes/src/nodes.rs
@@ -1,21 +1,21 @@
 use crate::{cleanup, programs::upload_programs};
 use ::tracing::{info, warn};
-use anyhow::{Context, Error, anyhow, bail};
+use anyhow::{anyhow, bail, Context, Error};
 use basic_types::PartyId;
 use ctor::ctor;
 use futures::future;
-use grpc_channel::{AuthenticatedGrpcChannel, GrpcChannelConfig, token::TokenAuthenticator};
+use grpc_channel::{token::TokenAuthenticator, AuthenticatedGrpcChannel, GrpcChannelConfig};
 use nilchain_client::{
     client::NillionChainClient,
     key::{NillionChainAddress, NillionChainPrivateKey},
 };
-use nillion_chain_node::{
+use nilchain_node::{
     node::{GenesisAccount, NillionChainNode, NillionChainNodeBuilder},
     transactions::TokenAmount,
 };
 use nillion_client::{
-    Ed25519SigningKey, Secp256k1SigningKey, SigningKey, UserId, builder::VmClientBuilder, grpc::MembershipClient,
-    payments::NillionChainClientPayer, vm::VmClient,
+    builder::VmClientBuilder, grpc::MembershipClient, payments::NillionChainClientPayer, vm::VmClient,
+    Ed25519SigningKey, Secp256k1SigningKey, SigningKey, UserId,
 };
 use node_config::{Config, KeyKind, PrefundedAccount, PrivateKeyConfig};
 use once_cell::sync::Lazy;
@@ -36,8 +36,8 @@ use std::{
 };
 use tempfile::TempDir;
 use tokio::runtime::Runtime;
-use tracing_fixture::{Tracing, tracing};
-use xshell::{Shell, cmd};
+use tracing_fixture::{tracing, Tracing};
+use xshell::{cmd, Shell};
 
 // These can be overwritten by environment variables
 const MAX_PAYERS_NUM: usize = 20;
diff --git a/tests/functional/src/payments_test.rs b/tests/functional/src/payments_test.rs
@@ -4,9 +4,9 @@ use nilchain_client::{
     transactions::TokenAmount,
     tx::{DefaultPaymentTransactionRetriever, PaymentTransactionRetriever},
 };
-use nodes_fixtures::nodes::{Nodes, nodes};
+use nodes_fixtures::nodes::{nodes, Nodes};
 use rstest::rstest;
-use tracing_fixture::{Tracing, tracing};
+use tracing_fixture::{tracing, Tracing};
 
 #[rstest]
 #[tokio::test]
diff --git a/tools/load-tool/src/clients_pool.rs b/tools/load-tool/src/clients_pool.rs
@@ -1,17 +1,18 @@
 //! Cyclic pool of clients.
 
-use anyhow::{Context, Error, anyhow};
+use anyhow::{anyhow, Context, Error};
 use log::info;
 use nilchain_client::{
     client::NillionChainClient,
     key::{NillionChainAddress, NillionChainPrivateKey},
     transactions::TokenAmount,
 };
 use nillion_client::{
-    SigningKey, async_trait,
+    async_trait,
     builder::VmClientBuilder,
     payments::{NilChainPayer, TxHash},
     vm::VmClient,
+    SigningKey,
 };
 use std::{sync::Arc, time::Duration};
 use tokio::sync::Mutex;
diff --git a/tools/load-tool/src/main.rs b/tools/load-tool/src/main.rs
@@ -1,4 +1,4 @@
-use anyhow::{Context, Error, bail};
+use anyhow::{bail, Context, Error};
 use chrono::{SecondsFormat, Utc};
 use clap::Parser;
 use load_tool::{
diff --git a/tools/nillion-devnet/Cargo.toml b/tools/nillion-devnet/Cargo.toml
@@ -27,6 +27,6 @@ node = { path = "../../node" }
 node-config = { path = "../../libs/node-config" }
 program-auditor = { path = "../../nada-lang/program-auditor" }
 tools-config = { path = "../libs/tools-config" }
-nillion-chain-node = { path = "../../libs/nillion-chain/node" }
+nilchain-node = { path = "../../libs/nilchain-node" }
 nilchain-client = { workspace = true }
 user-keypair = { path = "../../libs/user-keypair" }
diff --git a/tools/nillion-devnet/src/cluster.rs b/tools/nillion-devnet/src/cluster.rs
@@ -6,34 +6,34 @@ use crate::{
     identity::{NodeIdentities, NodeIdentity},
     proxy::NilchainProxy,
 };
-use anyhow::{Context, Result, anyhow, bail};
+use anyhow::{anyhow, bail, Context, Result};
 use basic_types::party::PartyId;
-use clap::{CommandFactory, error::ErrorKind};
+use clap::{error::ErrorKind, CommandFactory};
 use futures::future::join_all;
 use math_lib::modular::EncodedModulo;
 use nilchain_client::{client::NillionChainClient, key::NillionChainPrivateKey};
-use nillion_chain_node::{
+use nilchain_node::{
     node::{GenesisAccount, NillionChainInitMode, NillionChainNode, NillionChainNodeBuilder},
     transactions::TokenAmount,
 };
 use node::{
     builder::{NodeBuilder, NodeHandle},
     config::{Cluster, ClusterMember, KeyKind, MetricsConfig, Prime, PublicKeys},
 };
-use rand::{Rng, SeedableRng, rngs::SmallRng, seq::SliceRandom};
+use rand::{rngs::SmallRng, seq::SliceRandom, Rng, SeedableRng};
 use std::{
     collections::HashMap,
     fs::{self, create_dir_all},
     net::{IpAddr, Ipv4Addr, SocketAddr},
     path::{Path, PathBuf},
     time::Duration,
 };
-use tempfile::{TempDir, tempdir};
+use tempfile::{tempdir, TempDir};
 use tokio::{
     select,
-    signal::unix::{SignalKind, signal},
+    signal::unix::{signal, SignalKind},
 };
-use tools_config::{ToolConfig, networks::PaymentsConfig, path::config_directory};
+use tools_config::{networks::PaymentsConfig, path::config_directory, ToolConfig};
 use uuid::Uuid;
 
 const MIN_LISTEN_PORT: u16 = 30000;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use anyhow::{Context, Result, anyhow};`
	`1`	`+use anyhow::{anyhow, Context, Result};`
`2`	`2`	`use nilchain_client::{key::NillionChainPrivateKey, transactions::TokenAmount};`
`3`	`3`	`use std::{`
`4`	`4`	`env,`