Skip to content

arti-client: Rename KeyStore to Keystore.

gabi-250 requested to merge gabi-250/arti:fix-unfortunate-merge-outcome into main

KeyStore was renamed to Keystore globally in !1355 (merged). This fixes a compile error caused an unfortunate series of non-conflicting (from git's POV) but incompatible merges:

  • !1356 (merged) added a line threferencing an error variant that capitalizes the "s" in "KeyStore" (ErrorDetail::KeyStore)
  • !1356 (merged) landed just before !1355 (merged) (the global renaming). Since there was no conflict between the 2, we're now in a state where the code added in !1356 (merged) is referencing an ErrorDetail variant that no longer exists.

Merge request reports