Provide support for solidity in serde_generate

serde-generate/src/solidity.rs

@@ -834,26 +834,32 @@ struct SolRegistry {
 impl SolRegistry {
     fn insert(&mut self, sol_format: SolFormat) {
         let key_name = sol_format.key_name();
-        if matches!(sol_format, SolFormat::Primitive(Primitive::I8)) {
-            self.names
-                .insert("uint8".to_string(), SolFormat::Primitive(Primitive::U8));
-        }
-        if matches!(sol_format, SolFormat::Primitive(Primitive::I16)) {
-            self.names
-                .insert("uint16".to_string(), SolFormat::Primitive(Primitive::U16));
-        }
-        if matches!(sol_format, SolFormat::Primitive(Primitive::I32)) {
-            self.names
-                .insert("uint32".to_string(), SolFormat::Primitive(Primitive::U32));
-        }
-        if matches!(sol_format, SolFormat::Primitive(Primitive::I64)) {
-            self.names
-                .insert("uint64".to_string(), SolFormat::Primitive(Primitive::U64));
-        }
-        if matches!(sol_format, SolFormat::Primitive(Primitive::I128)) {
-            self.names
-                .insert("uint128".to_string(), SolFormat::Primitive(Primitive::U128));
+        // If we insert the signed version, then we also need the unsigned one internally
+        match sol_format {
+            SolFormat::Primitive(Primitive::I8) => {
+                self.names
+                    .insert("uint8".to_string(), SolFormat::Primitive(Primitive::U8));
+            }
+            SolFormat::Primitive(Primitive::I16) => {
+                self.names
+                    .insert("uint16".to_string(), SolFormat::Primitive(Primitive::U16));
+            }
+            SolFormat::Primitive(Primitive::I32) => {
+                self.names
+                    .insert("uint32".to_string(), SolFormat::Primitive(Primitive::U32));
+            }
+            SolFormat::Primitive(Primitive::I64) => {
+                self.names
+                    .insert("uint64".to_string(), SolFormat::Primitive(Primitive::U64));
+            }
+            SolFormat::Primitive(Primitive::I128) => {
+                self.names
+                    .insert("uint128".to_string(), SolFormat::Primitive(Primitive::U128));
+            }
+            _ => {}
         }
+        // Typename entries are by definition already covered and do not need
+        // to be inserted. Others do.
         if !matches!(sol_format, SolFormat::TypeName(_)) {
             self.names.insert(key_name, sol_format);
         }

serde-generate/tests/solidity_generation.rs

@@ -148,5 +148,5 @@ fn test_solidity_compilation() {
         generator.output(&mut test_file, &registry).unwrap();
     }
 
-    let _bytecode = get_bytecode(path, "test.sol", "test").unwrap();
+    get_bytecode(path, "test.sol", "test").unwrap();
 }

serde-generate/tests/solidity_runtime.rs

@@ -28,15 +28,8 @@ fn test_contract(bytecode: Bytes, encoded_args: Bytes) {
 
         let result: ExecutionResult = evm.transact_commit().unwrap();
 
-        let ExecutionResult::Success {
-            reason: _,
-            gas_used: _,
-            gas_refunded: _,
-            logs: _,
-            output,
-        } = result
-        else {
-            panic!("The TxKind::Create execution failed to be done");
+        let ExecutionResult::Success { output, .. } = result else {
+            panic!("The TxKind::Create execution failed");
         };
         let Output::Create(_, Some(contract_address)) = output else {
             panic!("Failure to create the contract");
@@ -54,15 +47,8 @@ fn test_contract(bytecode: Bytes, encoded_args: Bytes) {
 
     let result: ExecutionResult = evm.transact_commit().unwrap();
 
-    let ExecutionResult::Success {
-        reason: _,
-        gas_used: _,
-        gas_refunded: _,
-        logs: _,
-        output: _,
-    } = result
-    else {
-        panic!("The TxKind::Call execution failed to be done");
+    let ExecutionResult::Success { .. } = result else {
+        panic!("The TxKind::Call execution failed");
     };
 }