Update xdrgen (#317)

* Update xdrgen * upd * upd to use i174-2 * upd * upd * upd
stellar · Nov 3, 2023 · 2597c26 · 2597c26
1 parent 16f4d7c
commit 2597c26
Show file tree

Hide file tree

Showing 10 changed files with 5,661 additions and 4,989 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ CARGO_HACK_ARGS=--feature-powerset --exclude-features default --group-features b
 
 CARGO_DOC_ARGS?=--open
 
-XDRGEN_VERSION=64612a24
+XDRGEN_VERSION=cbff4b31
 XDRGEN_TYPES_CUSTOM_STR_IMPL=PublicKey,AccountId,MuxedAccount,MuxedAccountMed25519,SignerKey,SignerKeyEd25519SignedPayload,NodeId,ScAddress
 
 all: build test

diff --git a/src/bin/stellar-xdr/decode.rs b/src/bin/stellar-xdr/decode.rs
@@ -82,10 +82,7 @@ macro_rules! run_x {
                 )
             })?;
             for f in &mut files {
-                let mut f = stellar_xdr::$m::DepthLimitedRead::new(
-                    f,
-                    stellar_xdr::$m::DEFAULT_XDR_RW_DEPTH_LIMIT,
-                );
+                let mut f = stellar_xdr::$m::Limited::new(f, stellar_xdr::$m::Limits::none());
                 match self.input {
                     InputFormat::Single => {
                         let t = stellar_xdr::$m::Type::read_xdr_to_end(r#type, &mut f)?;

diff --git a/src/bin/stellar-xdr/encode.rs b/src/bin/stellar-xdr/encode.rs
@@ -36,7 +36,8 @@ impl From<stellar_xdr::curr::Error> for Error {
             | stellar_xdr::curr::Error::Utf8Error(_)
             | stellar_xdr::curr::Error::InvalidHex
             | stellar_xdr::curr::Error::Io(_)
-            | stellar_xdr::curr::Error::DepthLimitExceeded => Error::WriteXdrCurr(e),
+            | stellar_xdr::curr::Error::DepthLimitExceeded
+            | stellar_xdr::curr::Error::LengthLimitExceeded => Error::WriteXdrCurr(e),
             stellar_xdr::curr::Error::Json(_) => Error::ReadJsonCurr(e),
         }
     }
@@ -53,7 +54,8 @@ impl From<stellar_xdr::next::Error> for Error {
             | stellar_xdr::next::Error::Utf8Error(_)
             | stellar_xdr::next::Error::InvalidHex
             | stellar_xdr::next::Error::Io(_)
-            | stellar_xdr::next::Error::DepthLimitExceeded => Error::WriteXdrNext(e),
+            | stellar_xdr::next::Error::DepthLimitExceeded
+            | stellar_xdr::next::Error::LengthLimitExceeded => Error::WriteXdrNext(e),
             stellar_xdr::next::Error::Json(_) => Error::ReadJsonNext(e),
         }
     }
@@ -117,10 +119,11 @@ macro_rules! run_x {
                 match self.input {
                     InputFormat::Json => {
                         let t = stellar_xdr::$m::Type::read_json(r#type, f)?;
+                        let l = stellar_xdr::$m::Limits::none();
 
                         match self.output {
-                            OutputFormat::Single => stdout().write_all(&t.to_xdr()?)?,
-                            OutputFormat::SingleBase64 => println!("{}", t.to_xdr_base64()?),
+                            OutputFormat::Single => stdout().write_all(&t.to_xdr(l)?)?,
+                            OutputFormat::SingleBase64 => println!("{}", t.to_xdr_base64(l)?),
                         }
                     }
                 };

diff --git a/src/bin/stellar-xdr/guess.rs b/src/bin/stellar-xdr/guess.rs
@@ -69,9 +69,9 @@ impl Default for OutputFormat {
 macro_rules! run_x {
     ($f:ident, $m:ident) => {
         fn $f(&self) -> Result<(), Error> {
-            let mut f = stellar_xdr::$m::DepthLimitedRead::new(
+            let mut f = stellar_xdr::$m::Limited::new(
                 ResetRead::new(self.file()?),
-                stellar_xdr::$m::DEFAULT_XDR_RW_DEPTH_LIMIT,
+                stellar_xdr::$m::Limits::none(),
             );
             'variants: for v in stellar_xdr::$m::TypeVariant::VARIANTS {
                 f.inner.reset();