ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

backend: declare CHANGE_ID_HASH_LENGTH as constant

Browse source
This commit is contained in:
Yuya Nishihara 2023-01-21 16:05:49 +09:00
parent 6d0a6f32aa
commit ef33bd76df
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/src/backend.rs
View file

@ -23,6 +23,8 @@ use thiserror::Error;
use crate::content_hash::ContentHash; use crate::content_hash::ContentHash;
use crate::repo_path::{RepoPath, RepoPathComponent}; use crate::repo_path::{RepoPath, RepoPathComponent};
pub const CHANGE_ID_HASH_LENGTH: usize = 16;
pub trait ObjectId { pub trait ObjectId {
fn new(value: Vec<u8>) -> Self; fn new(value: Vec<u8>) -> Self;
fn object_type(&self) -> String; fn object_type(&self) -> String;
@ -337,7 +339,7 @@ pub fn make_root_commit(empty_tree_id: TreeId) -> Commit {
email: String::new(), email: String::new(),
timestamp, timestamp,
}; };
let change_id = ChangeId::new(vec![0; 16]); let change_id = ChangeId::new(vec![0; CHANGE_ID_HASH_LENGTH]);
Commit { Commit {
parents: vec![], parents: vec![],
predecessors: vec![], predecessors: vec![],

4
lib/src/settings.rs
View file

@ -19,7 +19,7 @@ use chrono::DateTime;
use rand::prelude::*; use rand::prelude::*;
use rand_chacha::ChaCha20Rng; use rand_chacha::ChaCha20Rng;
use crate::backend::{ChangeId, ObjectId, Signature, Timestamp}; use crate::backend::{ChangeId, ObjectId, Signature, Timestamp, CHANGE_ID_HASH_LENGTH};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct UserSettings { pub struct UserSettings {
@ -167,7 +167,7 @@ impl UserSettings {
pub struct JJRng(Mutex<ChaCha20Rng>); pub struct JJRng(Mutex<ChaCha20Rng>);
impl JJRng { impl JJRng {
pub fn new_change_id(&self) -> ChangeId { pub fn new_change_id(&self) -> ChangeId {
let random_bytes: [u8; 16] = self.gen(); let random_bytes: [u8; CHANGE_ID_HASH_LENGTH] = self.gen();
ChangeId::new(random_bytes.into()) ChangeId::new(random_bytes.into())
} }