Skip to content

Commit eaf9488

Browse files
committed
fix: resolve compilation errors across entire app
1 parent a06d55c commit eaf9488

Some content is hidden

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

75 files changed

+2139
-259
lines changed

Cargo.lock

Lines changed: 80 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ hex = "0.4.3"
2424

2525
# V2 Actor System dependencies
2626
actix = "0.13"
27+
actix-rt = "2.9"
2728
async-trait = "0.1"
2829
uuid = { version = "1.0", features = ["v4", "serde"] }
2930
num_cpus = "1.0"

app/Cargo.toml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ tokio-util = { version = "0.6", features = ["codec", "compat", "time"] }
5757
tokio-io-timeout = "1"
5858
async-trait = { workspace = true }
5959

60+
# Additional dependencies for compilation
61+
dashmap = "5.5"
62+
serde_yaml = "0.9"
63+
64+
# Missing dependencies for compilation
65+
actix-rt = { workspace = true }
66+
parking_lot = "0.12"
67+
6068
# V2 Actor System
6169
actix = { workspace = true }
6270
uuid = { workspace = true }
@@ -123,6 +131,11 @@ tonic-build = "0.10"
123131
tempfile = "3.8.1"
124132
criterion = { version = "0.5", features = ["html_reports"] }
125133
sha2 = "0.10"
134+
validator = "0.18"
135+
tracing-test = "0.2"
136+
hostname = "0.3"
137+
rustc_version = "0.4"
138+
dashmap = "5.5"
126139

127140
[[bench]]
128141
name = "sync_benchmarks"

app/src/actors/bridge/actors/bridge/alys_actor_impl.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ use crate::actors::bridge::{
2121
actors::bridge::BridgeActor,
2222
};
2323

24-
use super::{state::BridgeActorState, BridgeError};
24+
use super::state::BridgeActorState;
25+
use crate::actors::bridge::shared::errors::BridgeError;
2526

2627
#[async_trait]
2728
impl AlysActor for BridgeActor {

app/src/actors/bridge/actors/bridge/handlers.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use tracing::{info, warn, error};
77
use uuid::Uuid;
88

99
use super::actor::*;
10+
use super::metrics::BridgeCoordinationMetrics;
1011
use crate::actors::bridge::messages::*;
1112
use crate::types::*;
1213

app/src/actors/bridge/actors/pegin/alys_actor_impl.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ use crate::actors::bridge::{
2121
actors::pegin::PegInActor,
2222
};
2323

24-
use super::{state::PegInActorState, PegInError};
24+
use super::state::PegInActorState;
25+
use crate::actors::bridge::shared::errors::BridgeError;
2526

2627
#[async_trait]
2728
impl AlysActor for PegInActor {
2829
type Config = PegInConfig;
29-
type Error = PegInError;
30+
type Error = BridgeError;
3031
type Message = PegInMessage;
3132
type State = PegInActorState;
3233

app/src/actors/bridge/actors/stream/alys_actor_impl.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ use crate::actors::bridge::{
2525
};
2626
use super::{
2727
StreamActor,
28-
GovernanceConnection,
29-
ConnectionStatus,
30-
StreamMetrics,
28+
actor::{GovernanceConnection, ConnectionStatus},
29+
metrics::StreamMetrics,
3130
};
3231

3332
/// State structure for actor_system compatibility

app/src/actors/bridge/actors/stream/environment.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ use std::time::Duration;
1010
use serde::{Deserialize, Serialize};
1111
use tracing::*;
1212

13-
use super::config::{
14-
AdvancedStreamConfig, EnvironmentType, CoreStreamConfig,
15-
AdvancedConnectionConfig, AuthenticationConfig, MessagingConfig,
16-
PerformanceConfig, FeatureConfig, MonitoringConfig, SecurityConfig,
17-
GovernanceEndpoint,
13+
use crate::config::{
14+
StreamConfig as AdvancedStreamConfig, Environment as EnvironmentType,
15+
StreamConfig as CoreStreamConfig,
16+
TlsConfig as AdvancedConnectionConfig, AuthConfig as AuthenticationConfig,
17+
StreamConfig as MessagingConfig,
18+
StreamConfig as PerformanceConfig, StreamConfig as FeatureConfig,
19+
MonitoringConfig, SecurityConfig,
20+
GovernanceConfig as GovernanceEndpoint,
1821
};
1922
use super::super::super::shared::errors::ConfigError;
2023

app/src/actors/bridge/actors/stream/hot_reload.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ use notify::{Watcher, RecursiveMode, Event, EventKind, event::AccessKind};
1111
use validator::{Validate, ValidationErrors};
1212
use tracing::*;
1313

14-
use super::{
15-
config::AdvancedStreamConfig,
16-
config::ConfigError,
17-
};
14+
use crate::config::{StreamConfig as AdvancedStreamConfig, ConfigError};
1815

1916
/// Configuration change notification system
2017
#[derive(Debug, Clone)]
@@ -503,7 +500,7 @@ impl AdvancedStreamConfig {
503500

504501
/// Validate security requirements
505502
async fn validate_security_requirements(&self) -> Result<(), ConfigError> {
506-
use super::config::EnvironmentType;
503+
use crate::config::Environment as EnvironmentType;
507504

508505
// Validate TLS configuration in production
509506
if self.environment.environment_type == EnvironmentType::Production {

app/src/actors/bridge/actors/stream/lifecycle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use actor_system::{
1111
error::{ActorError, ActorResult},
1212
};
1313

14-
use super::{StreamActor, ConnectionStatus};
14+
use super::{StreamActor, actor::ConnectionStatus};
1515
use crate::actors::bridge::shared::errors::BridgeError;
1616

1717
/// Lifecycle metadata for StreamActor

0 commit comments

Comments
 (0)