diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-02-15 13:58:15 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-02-15 14:06:34 +0100 |
| commit | eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d (patch) | |
| tree | 84f6746ec92ca3a5344da22edadcd1ac3413aa29 /src/util/data.rs | |
| parent | cf2af186fcc0c8f581a966454b6cd4720d3821f0 (diff) | |
| parent | 7be3f15e45fcfff10a45302a040c2919a3ba8ccd (diff) | |
| download | garage-eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d.tar.gz garage-eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d.zip | |
Merge branch 'main' into next-0.10
Diffstat (limited to 'src/util/data.rs')
| -rw-r--r-- | src/util/data.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/util/data.rs b/src/util/data.rs index bdd8daee..2579fd1b 100644 --- a/src/util/data.rs +++ b/src/util/data.rs @@ -85,15 +85,15 @@ impl FixedBytes32 { } } -impl From<netapp::NodeID> for FixedBytes32 { - fn from(node_id: netapp::NodeID) -> FixedBytes32 { +impl From<garage_net::NodeID> for FixedBytes32 { + fn from(node_id: garage_net::NodeID) -> FixedBytes32 { FixedBytes32::try_from(node_id.as_ref()).unwrap() } } -impl From<FixedBytes32> for netapp::NodeID { - fn from(bytes: FixedBytes32) -> netapp::NodeID { - netapp::NodeID::from_slice(bytes.as_slice()).unwrap() +impl From<FixedBytes32> for garage_net::NodeID { + fn from(bytes: FixedBytes32) -> garage_net::NodeID { + garage_net::NodeID::from_slice(bytes.as_slice()).unwrap() } } |