fix some test failures, hex encode u128,u256 in SATN format

clockworklabs · Aug 20, 2024 · a3a9cac · a3a9cac
1 parent ddd42c1
commit a3a9cac
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/crates/core/src/db/datastore/locking_tx_datastore/datastore.rs b/crates/core/src/db/datastore/locking_tx_datastore/datastore.rs
@@ -1353,12 +1353,12 @@ mod tests {
             ColRow { table: ST_CONSTRAINT_ID.into(), pos: 4, name: "columns", ty: AlgebraicType::array(ColId::get_type()) },
 
             ColRow { table: ST_MODULE_ID.into(), pos: 0, name: "database_address", ty: AlgebraicType::U128 },
-            ColRow { table: ST_MODULE_ID.into(), pos: 1, name: "owner_identity", ty: AlgebraicType::bytes() },
+            ColRow { table: ST_MODULE_ID.into(), pos: 1, name: "owner_identity", ty: AlgebraicType::U256 },
             ColRow { table: ST_MODULE_ID.into(), pos: 2, name: "program_kind", ty: AlgebraicType::U8 },
-            ColRow { table: ST_MODULE_ID.into(), pos: 3, name: "program_hash", ty: AlgebraicType::bytes() },
+            ColRow { table: ST_MODULE_ID.into(), pos: 3, name: "program_hash", ty: AlgebraicType::U256 },
             ColRow { table: ST_MODULE_ID.into(), pos: 4, name: "program_bytes", ty: AlgebraicType::bytes() },
 
-            ColRow { table: ST_CLIENT_ID.into(), pos: 0, name: "identity", ty: AlgebraicType::bytes()},
+            ColRow { table: ST_CLIENT_ID.into(), pos: 0, name: "identity", ty: AlgebraicType::U256},
             ColRow { table: ST_CLIENT_ID.into(), pos: 1, name: "address", ty: AlgebraicType::U128},
 
             ColRow { table: ST_VAR_ID.into(), pos: 0, name: "name", ty: AlgebraicType::String },

diff --git a/crates/core/src/sql/compiler.rs b/crates/core/src/sql/compiler.rs
@@ -412,7 +412,7 @@ mod tests {
         // Check tuples
         let kind = [
             ("a", AlgebraicType::String),
-            ("b", AlgebraicType::bytes()),
+            ("b", AlgebraicType::U256),
             ("o", Identity::get_type()),
             ("p", Address::get_type()),
         ]

diff --git a/crates/sats/src/satn.rs b/crates/sats/src/satn.rs
@@ -273,10 +273,10 @@ impl<'a, 'b> ser::Serializer for SatnFormatter<'a, 'b> {
         write!(self, "{v}")
     }
     fn serialize_u128(mut self, v: u128) -> Result<Self::Ok, Self::Error> {
-        write!(self, "{v}")
+        write!(self, "0x{}", hex::encode(v.to_le_bytes()))
     }
     fn serialize_u256(mut self, v: u256) -> Result<Self::Ok, Self::Error> {
-        write!(self, "{v}")
+        write!(self, "0x{}", hex::encode(v.to_le_bytes()))
     }
     fn serialize_i8(mut self, v: i8) -> Result<Self::Ok, Self::Error> {
         write!(self, "{v}")

diff --git a/crates/standalone/src/control_db.rs b/crates/standalone/src/control_db.rs
@@ -259,7 +259,7 @@ impl ControlDb {
         let name = b"clockworklabs:";
         let bytes = [name, bytes].concat();
         let hash = hash_bytes(bytes);
-        let address = Address::from_slice(&hash.abbreviate());
+        let address = Address::from_slice(hash.abbreviate());
         Ok(address)
     }