Move to bindings module.

crates/net/src/protocol/common.rs → crates/net/src/protocol/bindings/common.rs

@@ -1,7 +1,7 @@
 include!(concat!(env!("OUT_DIR"), "/common.rs"));
 
-use super::{decode_uuid, encode_uuid, Error, ProtoBinding, Result};
 use crate::{
+    protocol::{decode_uuid, encode_uuid, Error, ProtoBinding, Result},
     sdk::{
         commit::{CommitHash, CommitProof, CommitState},
         events::{CheckedPatch, EventRecord},

crates/net/src/protocol/diff.rs → crates/net/src/protocol/bindings/diff.rs

@@ -1,7 +1,7 @@
 include!(concat!(env!("OUT_DIR"), "/diff.rs"));
 
-use super::{Error, ProtoBinding, Result};
 use crate::{
+    protocol::{Error, ProtoBinding, Result},
     sdk::{
         commit::{CommitHash, CommitProof},
         events::EventRecord,

crates/net/src/protocol/bindings/mod.rs

@@ -0,0 +1,21 @@
+mod common;
+mod diff;
+mod files;
+#[cfg(feature = "listen")]
+mod notifications;
+mod patch;
+#[cfg(feature = "pairing")]
+mod relay;
+mod scan;
+mod sync;
+
+pub use diff::{DiffRequest, DiffResponse};
+#[cfg(feature = "listen")]
+pub use notifications::ChangeNotification;
+pub use patch::{PatchRequest, PatchResponse};
+#[cfg(feature = "pairing")]
+pub(crate) use relay::{
+    pairing_message, PairingConfirm, PairingMessage, PairingReady,
+    PairingRequest, RelayHeader, RelayPacket, RelayPayload,
+};
+pub use scan::{ScanRequest, ScanResponse};

crates/net/src/protocol/patch.rs → crates/net/src/protocol/bindings/patch.rs

@@ -1,7 +1,7 @@
 include!(concat!(env!("OUT_DIR"), "/patch.rs"));
 
-use super::{Error, ProtoBinding, Result};
 use crate::{
+    protocol::{Error, ProtoBinding, Result},
     sdk::{
         commit::{CommitHash, CommitProof},
         events::{CheckedPatch, EventRecord},

crates/net/src/protocol/scan.rs → crates/net/src/protocol/bindings/scan.rs

@@ -1,7 +1,10 @@
 include!(concat!(env!("OUT_DIR"), "/scan.rs"));
 
-use super::{Error, ProtoBinding, Result};
-use crate::{sdk::commit::CommitProof, sync::EventLogType};
+use crate::{
+    protocol::{Error, ProtoBinding, Result},
+    sdk::commit::CommitProof,
+    sync::EventLogType,
+};
 
 /// Request commit proofs from an event log.
 #[derive(Debug, Clone, PartialEq, Eq)]

crates/net/src/protocol/sync.rs → crates/net/src/protocol/bindings/sync.rs

@@ -1,13 +1,15 @@
 include!(concat!(env!("OUT_DIR"), "/sync.rs"));
 
-use super::{decode_uuid, encode_uuid, Error, ProtoBinding, Result};
-use crate::sdk::{
-    commit::Comparison,
-    events::{Diff, EventRecord, Patch},
-};
-use crate::sync::{
-    ChangeSet, MaybeDiff, MergeOutcome, Origin, SyncCompare, SyncDiff,
-    SyncPacket, SyncStatus, UpdateSet,
+use crate::{
+    protocol::{decode_uuid, encode_uuid, Error, ProtoBinding, Result},
+    sdk::{
+        commit::Comparison,
+        events::{Diff, EventRecord, Patch},
+    },
+    sync::{
+        ChangeSet, MaybeDiff, MergeOutcome, Origin, SyncCompare, SyncDiff,
+        SyncPacket, SyncStatus, UpdateSet,
+    },
 };
 use indexmap::{IndexMap, IndexSet};
 use std::collections::HashMap;

crates/net/src/protocol/mod.rs

@@ -16,31 +16,14 @@
 //
 // A 64-bit machine is assumed as we cast between `u64` and `usize`
 // for convenience, the code may panic on 32-bit machines.
-mod common;
-mod diff;
+
+mod bindings;
 mod error;
-mod files;
-#[cfg(feature = "listen")]
-mod notifications;
-mod patch;
-#[cfg(feature = "pairing")]
-mod relay;
-mod scan;
-mod sync;
-
-pub use diff::{DiffRequest, DiffResponse};
+
+pub use bindings::*;
 pub use error::Error;
-#[cfg(feature = "listen")]
-pub use notifications::ChangeNotification;
-pub use patch::{PatchRequest, PatchResponse};
-#[cfg(feature = "pairing")]
-pub(crate) use relay::{
-    pairing_message, PairingConfirm, PairingMessage, PairingReady,
-    PairingRequest, RelayHeader, RelayPacket, RelayPayload,
-};
 
 use prost::{bytes::Buf, Message};
-pub use scan::{ScanRequest, ScanResponse};
 
 /// Result type for the wire protocol.
 pub type Result<T> = std::result::Result<T, Error>;

crates/sdk/src/events/mod.rs

@@ -31,7 +31,6 @@ pub use self::log::{
     EventRecord, FolderEventLog, FolderReducer, MemoryData, MemoryEventLog,
     MemoryFolderLog, MemoryLog,
 };
-use crate::vault::VaultId;
 
 #[cfg(feature = "device")]
 pub use self::log::{DeviceEventLog, DeviceReducer};