Make the sequencer more solid (MystenLabs#1049)

Make the sequencer robust

sui_core/Cargo.toml

@@ -46,6 +46,7 @@ similar-asserts = "1.2.0"
 serde-reflection = "0.3.5"
 serde_yaml = "0.8.23"
 pretty_assertions = "1.2.0"
+temp_testdir = "0.2"
 
 test_utils = { path = "../test_utils" }
 

sui_core/src/consensus_client.rs

@@ -85,7 +85,7 @@ impl ConsensusClient {
     /// and right order.
     async fn synchronize(&mut self, connection: &mut TcpDataStream) -> SuiResult<()> {
         let request = ConsensusSync {
-            sequencer_number: self.last_consensus_index,
+            sequence_number: self.last_consensus_index,
         };
         let bytes = Bytes::from(serialize_consensus_sync(&request));
         connection
@@ -106,9 +106,9 @@ impl ConsensusClient {
             Ok(SerializedMessage::ConsensusOutput(value)) => {
                 let ConsensusOutput {
                     message,
-                    sequencer_number,
+                    sequence_number,
                 } = *value;
-                (message, sequencer_number)
+                (message, sequence_number)
             }
             Ok(_) => {
                 log::error!("{}", SuiError::UnexpectedMessage);

sui_core/src/unit_tests/consensus_tests.rs

@@ -127,7 +127,10 @@ async fn handle_consensus_output() {
         buffer_size: NETWORK_BUFFER_SIZE,
         consensus_delay: Duration::from_millis(0),
     };
-    Sequencer::spawn(sequencer).await;
+    let store_path = temp_testdir::TempDir::default();
+    Sequencer::spawn(sequencer, store_path.as_ref())
+        .await
+        .unwrap();
 
     // Spawn a consensus client.
     let state = Arc::new(authority);
@@ -154,6 +157,9 @@ async fn handle_consensus_output() {
         state.db().last_consensus_index().unwrap(),
         SequenceNumber::from(1)
     );
+
+    // Cleanup the storage.
+    let _ = std::fs::remove_dir_all(store_path);
 }
 
 #[tokio::test]
@@ -170,7 +176,7 @@ async fn test_guardrail() {
 }
 
 #[tokio::test]
-async fn test_sync() {
+async fn sync_with_consensus() {
     // Initialize an authority with a (owned) gas object and a shared object.
     let mut objects = test_gas_objects();
     objects.push(test_shared_object());
@@ -192,7 +198,10 @@ async fn test_sync() {
         buffer_size: NETWORK_BUFFER_SIZE,
         consensus_delay: Duration::from_millis(0),
     };
-    Sequencer::spawn(sequencer).await;
+    let store_path = temp_testdir::TempDir::default();
+    Sequencer::spawn(sequencer, store_path.as_ref())
+        .await
+        .unwrap();
 
     // Submit a certificate to the sequencer.
     tokio::task::yield_now().await;
@@ -252,4 +261,7 @@ async fn test_sync() {
         .unwrap()
         .unwrap();
     assert_eq!(certificate_1_sequence, SequenceNumber::from(1));
+
+    // Cleanup the storage.
+    let _ = std::fs::remove_dir_all(store_path);
 }

sui_core/tests/staged/sui.yaml

@@ -120,11 +120,11 @@ CertifiedTransaction:
 ConsensusOutput:
   STRUCT:
     - message: BYTES
-    - sequencer_number:
+    - sequence_number:
         TYPENAME: SequenceNumber
 ConsensusSync:
   STRUCT:
-    - sequencer_number:
+    - sequence_number:
         TYPENAME: SequenceNumber
 Data:
   ENUM:

sui_types/src/messages.rs

@@ -1102,10 +1102,10 @@ impl BcsSignable for TransactionData {}
 pub struct ConsensusOutput {
     #[serde(with = "serde_bytes")]
     pub message: Vec<u8>,
-    pub sequencer_number: SequenceNumber,
+    pub sequence_number: SequenceNumber,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct ConsensusSync {
-    pub sequencer_number: SequenceNumber,
+    pub sequence_number: SequenceNumber,
 }

test_utils/Cargo.toml

@@ -15,5 +15,7 @@ log = "0.4.14"
 rand = "0.7.3"
 rocksdb = "0.18.0"
 
+typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev ="e44bca4513a6ff6c97399cd79e82e4bc00571ac3"}
+
 sui-types = { path = "../sui_types" }
 sui-network = { path = "../network_utils" }