Commit efcab15
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
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
866 | 866 | | |
867 | 867 | | |
868 | 868 | | |
869 | | - | |
870 | | - | |
871 | | - | |
872 | | - | |
873 | | - | |
| 869 | + | |
| 870 | + | |
874 | 871 | | |
875 | 872 | | |
876 | 873 | | |
877 | 874 | | |
878 | | - | |
| 875 | + | |
879 | 876 | | |
880 | 877 | | |
881 | 878 | | |
882 | 879 | | |
883 | 880 | | |
884 | | - | |
| 881 | + | |
885 | 882 | | |
886 | 883 | | |
887 | 884 | | |
| |||
890 | 887 | | |
891 | 888 | | |
892 | 889 | | |
893 | | - | |
| 890 | + | |
894 | 891 | | |
895 | 892 | | |
896 | 893 | | |
897 | | - | |
| 894 | + | |
898 | 895 | | |
899 | 896 | | |
900 | 897 | | |
| |||
908 | 905 | | |
909 | 906 | | |
910 | 907 | | |
911 | | - | |
| 908 | + | |
912 | 909 | | |
913 | 910 | | |
914 | 911 | | |
| |||
0 commit comments