@codama/renderers-rust 1.0.8 → 1.0.9

package/dist/templates/accountsPage.njk

@@ -132,23 +132,25 @@ impl<'a> TryFrom<&solana_program::account_info::AccountInfo<'a>> for {{ account.
 pub fn fetch_{{ account.name | snakeCase }}(
   rpc: &solana_client::rpc_client::RpcClient,
   address: &Pubkey,
-) -> Result<super::DecodedAccount<{{ account.name | pascalCase }}>, Error> {
-  let accounts = fetch_all_{{ account.name | snakeCase }}(rpc, vec![address])?;
+) -> Result<crate::shared::DecodedAccount<{{ account.name | pascalCase }}>, std::io::Error> {
+  let accounts = fetch_all_{{ account.name | snakeCase }}(rpc, &[*address])?;
   Ok(accounts[0].clone())
 }
 
 #[cfg(feature = "fetch")]
 pub fn fetch_all_{{ account.name | snakeCase }}(
   rpc: &solana_client::rpc_client::RpcClient,
-  addresses: Vec<Pubkey>,
-) -> Result<Vec<super::DecodedAccount<{{ account.name | pascalCase }}>>, Error> {
-    let accounts = rpc.get_multiple_accounts(&addresses)?;
-    let mut decoded_accounts: Vec<super::DecodedAccount<{{ account.name | pascalCase }}>> = Vec::new();
+  addresses: &[Pubkey],
+) -> Result<Vec<crate::shared::DecodedAccount<{{ account.name | pascalCase }}>>, std::io::Error> {
+    let accounts = rpc.get_multiple_accounts(&addresses)
+      .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))?;
+    let mut decoded_accounts: Vec<crate::shared::DecodedAccount<{{ account.name | pascalCase }}>> = Vec::new();
     for i in 0..addresses.len() {
       let address = addresses[i];
-      let account = accounts[i].as_ref().ok_or(format!("Account not found: {}", address))?;
+      let account = accounts[i].as_ref()
+        .ok_or(std::io::Error::new(std::io::ErrorKind::Other, format!("Account not found: {}", address)))?;
       let data = {{ account.name | pascalCase }}::from_bytes(&account.data)?;
-      decoded_accounts.push(super::DecodedAccount { address, account: account.clone(), data });
+      decoded_accounts.push(crate::shared::DecodedAccount { address, account: account.clone(), data });
     }
     Ok(decoded_accounts)
 }
@@ -157,25 +159,26 @@ pub fn fetch_all_{{ account.name | snakeCase }}(
 pub fn fetch_maybe_{{ account.name | snakeCase }}(
   rpc: &solana_client::rpc_client::RpcClient,
   address: &Pubkey,
-) -> Result<super::MaybeAccount<{{ account.name | pascalCase }}>, Error> {
-    let accounts = fetch_all_maybe_{{ account.name | snakeCase }}(rpc, vec![address])?;
+) -> Result<crate::shared::MaybeAccount<{{ account.name | pascalCase }}>, std::io::Error> {
+    let accounts = fetch_all_maybe_{{ account.name | snakeCase }}(rpc, &[*address])?;
     Ok(accounts[0].clone())
 }
 
 #[cfg(feature = "fetch")]
 pub fn fetch_all_maybe_{{ account.name | snakeCase }}(
   rpc: &solana_client::rpc_client::RpcClient,
-  addresses: Vec<Pubkey>,
-) -> Result<Vec<super::MaybeAccount<{{ account.name | pascalCase }}>>, Error> {
-    let accounts = rpc.get_multiple_accounts(&addresses)?;
-    let mut decoded_accounts: Vec<super::MaybeAccount<{{ account.name | pascalCase }}>> = Vec::new();
+  addresses: &[Pubkey],
+) -> Result<Vec<crate::shared::MaybeAccount<{{ account.name | pascalCase }}>>, std::io::Error> {
+    let accounts = rpc.get_multiple_accounts(&addresses)
+      .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))?;
+    let mut decoded_accounts: Vec<crate::shared::MaybeAccount<{{ account.name | pascalCase }}>> = Vec::new();
     for i in 0..addresses.len() {
       let address = addresses[i];
       if let Some(account) = accounts[i].as_ref() {
         let data = {{ account.name | pascalCase }}::from_bytes(&account.data)?;
-        decoded_accounts.push(super::MaybeAccount::Exists(super::DecodedAccount { address, account: account.clone(), data }));
+        decoded_accounts.push(crate::shared::MaybeAccount::Exists(crate::shared::DecodedAccount { address, account: account.clone(), data }));
       } else {
-        decoded_accounts.push(super::MaybeAccount::NotFound(address));
+        decoded_accounts.push(crate::shared::MaybeAccount::NotFound(address));
       }
     }
   Ok(decoded_accounts)

package/dist/templates/instructionsPage.njk

@@ -6,6 +6,7 @@
 {{ imports }}
 
 /// Accounts.
+#[derive(Debug)]
 pub struct {{ instruction.name | pascalCase }} {
   {% for account in instruction.accounts %}
     {% if account.docs.length > 0 %}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codama/renderers-rust",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Renders Rust clients for your programs",
   "exports": {
     "types": "./dist/types/index.d.ts",
@@ -30,13 +30,14 @@
   "dependencies": {
     "@solana/codecs-strings": "rc",
     "nunjucks": "^3.2.4",
+    "@codama/errors": "1.2.1",
     "@codama/nodes": "1.2.1",
-    "@codama/visitors-core": "1.2.1",
     "@codama/renderers-core": "1.0.3",
-    "@codama/errors": "1.2.1"
+    "@codama/visitors-core": "1.2.1"
   },
   "devDependencies": {
-    "@types/nunjucks": "^3.2.6"
+    "@types/nunjucks": "^3.2.6",
+    "@codama/nodes-from-anchor": "1.1.1"
   },
   "license": "MIT",
   "repository": {