Merge branch 'feature/support-new-tables-rocksdb' into fix_rocksdb

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 Description of the upcoming release here.
 
+### Added
+
+- [#1853](https://github.com/FuelLabs/fuel-core/pull/1853): Added a test case to verify the database's behavior when new columns are added to the RocksDB database.
+
 ## [Version 0.25.2]
 
 ### Fixed

crates/database/Cargo.toml

@@ -24,3 +24,6 @@ fuel-core-types = { workspace = true }
 
 [dev-dependencies]
 fuel-core-trace = { path = "../trace" }
+
+[features]
+test-helpers = []

crates/database/src/lib.rs

@@ -64,6 +64,13 @@ pub enum Error {
     Other(anyhow::Error),
 }
 
+#[cfg(feature = "test-helpers")]
+impl PartialEq for Error {
+    fn eq(&self, other: &Self) -> bool {
+        self.to_string().eq(&other.to_string())
+    }
+}
+
 impl From<Error> for anyhow::Error {
     fn from(error: Error) -> Self {
         anyhow::Error::msg(error)

crates/fuel-core/Cargo.toml

@@ -83,6 +83,7 @@ p2p = ["dep:fuel-core-p2p", "dep:fuel-core-sync"]
 relayer = ["dep:fuel-core-relayer"]
 rocksdb = ["dep:rocksdb", "dep:tempfile", "dep:num_cpus"]
 test-helpers = [
+  "fuel-core-database/test-helpers",
   "fuel-core-p2p?/test-helpers",
   "fuel-core-storage/test-helpers",
   "fuel-core-chain-config/test-helpers",

crates/fuel-core/src/state/rocks_db.rs

@@ -625,6 +625,28 @@ mod tests {
         )
     }
 
+    #[test]
+    fn open_new_columns() {
+        let tmp_dir = TempDir::new().unwrap();
+
+        // Given
+        let old_columns =
+            vec![Column::Coins, Column::Messages, Column::UploadedBytecodes];
+        let database_with_old_columns =
+            RocksDb::<OnChain>::open(tmp_dir.path(), old_columns.clone(), None)
+                .expect("Failed to open database with old columns");
+        drop(database_with_old_columns);
+
+        // When
+        let mut new_columns = old_columns;
+        new_columns.push(Column::ContractsAssets);
+        let database_with_new_columns =
+            RocksDb::<OnChain>::open(tmp_dir.path(), new_columns, None).map(|_| ());
+
+        // Then
+        assert_eq!(Ok(()), database_with_new_columns);
+    }
+
     #[test]
     fn can_put_and_read() {
         let key = vec![0xA, 0xB, 0xC];