Skip to content

Commit efcab15

Browse files
CopilotSteake
andcommitted
Merge latest master (81091cc) into copilot/expand-persistence-capabilities
Resolved conflicts in crates/bitcell-state/src/storage.rs: - Updated test variable names to match master (pubkey instead of address, locked_epoch: 10 instead of 0) - Kept all comprehensive persistence tests (transactions, snapshots, concurrent ops) - All 23 tests passing (16 unit storage tests + 7 integration tests) Co-authored-by: Steake <530040+Steake@users.noreply.github.com>
1 parent 9f84b92 commit efcab15

1 file changed

Lines changed: 7 additions & 10 deletions

File tree

crates/bitcell-state/src/storage.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -866,22 +866,19 @@ mod tests {
866866
#[test]
867867
fn test_account_persistence() {
868868
let temp_dir = TempDir::new().unwrap();
869-
let address = [1u8; 33];
870-
let account = Account {
871-
balance: 1000,
872-
nonce: 5,
873-
};
869+
let pubkey = [42u8; 33];
870+
let account = Account { balance: 1000, nonce: 5 };
874871

875872
// Store account
876873
{
877874
let storage = StorageManager::new(temp_dir.path()).unwrap();
878-
storage.store_account(&address, &account).unwrap();
875+
storage.store_account(&pubkey, &account).unwrap();
879876
}
880877

881878
// Reopen storage and verify persistence
882879
{
883880
let storage = StorageManager::new(temp_dir.path()).unwrap();
884-
let retrieved = storage.get_account(&address).unwrap().unwrap();
881+
let retrieved = storage.get_account(&pubkey).unwrap().unwrap();
885882
assert_eq!(retrieved.balance, 1000);
886883
assert_eq!(retrieved.nonce, 5);
887884
}
@@ -890,11 +887,11 @@ mod tests {
890887
#[test]
891888
fn test_bond_persistence() {
892889
let temp_dir = TempDir::new().unwrap();
893-
let miner_id = [2u8; 33];
890+
let miner_id = [99u8; 33];
894891
let bond = BondState {
895892
amount: 5000,
896893
status: crate::BondStatus::Active,
897-
locked_epoch: 0,
894+
locked_epoch: 10,
898895
};
899896

900897
// Store bond
@@ -908,7 +905,7 @@ mod tests {
908905
let storage = StorageManager::new(temp_dir.path()).unwrap();
909906
let retrieved = storage.get_bond(&miner_id).unwrap().unwrap();
910907
assert_eq!(retrieved.amount, 5000);
911-
assert_eq!(retrieved.locked_epoch, 0);
908+
assert_eq!(retrieved.locked_epoch, 10);
912909
assert!(retrieved.is_active());
913910
}
914911
}

0 commit comments

Comments
 (0)