Merge branch 'main' into testnet

massalabs · Dec 2, 2022 · 964b8ff · 964b8ff
2 parents 5237f66 + 9e20432
commit 964b8ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/massa-bootstrap/src/client.rs b/massa-bootstrap/src/client.rs
@@ -168,10 +168,15 @@ async fn stream_final_state_and_consensus(
                     };
                     panic!("Bootstrap failed, try to bootstrap again.");
                 }
+                BootstrapServerMessage::BootstrapError { error } => {
+                    return Err(std::io::Error::new(std::io::ErrorKind::InvalidData, error).into())
+                }
                 _ => {
-                    return Err(
-                        std::io::Error::new(std::io::ErrorKind::TimedOut, "bad message").into(),
+                    return Err(std::io::Error::new(
+                        std::io::ErrorKind::InvalidData,
+                        "unexpected message",
                     )
+                    .into())
                 }
             }
         }

diff --git a/massa-models/src/config/constants.rs b/massa-models/src/config/constants.rs
@@ -126,7 +126,7 @@ pub const MAX_DEFERRED_CREDITS_LENGTH: u64 = 10_000;
 /// Maximum size of executed ops
 pub const MAX_EXECUTED_OPS_LENGTH: u64 = 1_000;
 /// Maximum size of executed ops changes
-pub const MAX_EXECUTED_OPS_CHANGES_LENGTH: u64 = 1_000;
+pub const MAX_EXECUTED_OPS_CHANGES_LENGTH: u64 = 20_000;
 /// Maximum length of a datastore key
 pub const MAX_DATASTORE_KEY_LENGTH: u8 = 255;
 /// Maximum length of an operation datastore key