mine_empty_stacks* should return Result

components/clarinet-sdk-wasm/src/core.rs

@@ -930,20 +930,20 @@ impl SDK {
         self.mine_empty_burn_blocks(count)
     }
     #[wasm_bindgen(js_name=mineEmptyStacksBlock)]
-    pub fn mine_empty_stacks_block(&mut self) -> u32 {
+    pub fn mine_empty_stacks_block(&mut self) -> Result<u32, String> {
         let session = self.get_session_mut();
         match session.advance_stacks_chaintip(1) {
-            Ok(new_height) => new_height,
-            Err(msg) => panic!("{}", msg),
+            Ok(new_height) => Ok(new_height),
+            Err(msg) => Err(msg),
         }
     }
 
     #[wasm_bindgen(js_name=mineEmptyStacksBlocks)]
-    pub fn mine_empty_stacks_blocks(&mut self, count: Option<u32>) -> u32 {
+    pub fn mine_empty_stacks_blocks(&mut self, count: Option<u32>) -> Result<u32, String> {
         let session = self.get_session_mut();
         match session.advance_stacks_chaintip(count.unwrap_or(1)) {
-            Ok(new_height) => new_height,
-            Err(msg) => panic!("{}", msg),
+            Ok(new_height) => Ok(new_height),
+            Err(msg) => Err(msg),
         }
     }
 

components/clarinet-sdk/node/tests/simnet-usage-epoch3.test.ts

@@ -26,7 +26,7 @@ function deleteExistingDeploymentPlan() {
 
 beforeEach(async () => {
   deleteExistingDeploymentPlan();
-  await fs.copyFileSync(customDeploymentPlanPath, deploymentPlanPath);
+  fs.copyFileSync(customDeploymentPlanPath, deploymentPlanPath);
   simnet = await initSimnet("tests/fixtures/Clarinet.toml");
 });
 
@@ -39,16 +39,16 @@ describe("basic simnet interactions", () => {
     expect(simnet.blockHeight).toBe(1);
   });
 
-//   it("can mine empty blocks", () => {
-//     const blockHeight = simnet.stacksBlockHeight;
-//     const burnBlockHeight = simnet.burnBlockHeight;
-//     simnet.mineEmptyStacksBlock();
-//     expect(simnet.stacksBlockHeight).toBe(blockHeight + 1);
-//     expect(simnet.burnBlockHeight).toBe(burnBlockHeight);
-//     simnet.mineEmptyStacksBlocks(4);
-//     expect(simnet.stacksBlockHeight).toBe(blockHeight + 5);
-//     simnet.mineEmptyBurnBlocks(4);
-//     expect(simnet.burnBlockHeight).toBe(burnBlockHeight + 4);
-//     expect(simnet.stacksBlockHeight).toBe(blockHeight + 9);
-//   })
+  it("can mine empty blocks", () => {
+    const blockHeight = simnet.stacksBlockHeight;
+    const burnBlockHeight = simnet.burnBlockHeight;
+    simnet.mineEmptyStacksBlock();
+    expect(simnet.stacksBlockHeight).toBe(blockHeight + 1);
+    expect(simnet.burnBlockHeight).toBe(burnBlockHeight);
+    simnet.mineEmptyStacksBlocks(4);
+    expect(simnet.stacksBlockHeight).toBe(blockHeight + 5);
+    simnet.mineEmptyBurnBlocks(4);
+    expect(simnet.burnBlockHeight).toBe(burnBlockHeight + 4);
+    expect(simnet.stacksBlockHeight).toBe(blockHeight + 9);
+  })
 })

components/clarinet-sdk/node/tests/simnet-usage.test.ts

@@ -47,6 +47,9 @@ describe("basic simnet interactions", () => {
     simnet.mineEmptyBlocks(4);
     expect(simnet.blockHeight).toBe(blockHeight + 5);
   });
+  it("can not mine empty stacks block in pre-3.0", () => {
+    expect(() => simnet.mineEmptyStacksBlock()).toThrowError("stacks block height can't be advanced in 2.4");
+  })
 
   it("exposes devnet stacks accounts", () => {
     const accounts = simnet.getAccounts();

components/clarity-repl/src/repl/datastore.rs

@@ -54,7 +54,7 @@ pub struct BlockInfo {
     consensus_hash: ConsensusHash,
     vrf_seed: VRFSeed,
     burn_block_time: u64,
-    pub burn_block_height: u32,
+    burn_block_height: u32,
     miner: StacksAddress,
     burnchain_tokens_spent_for_block: u128,
     get_burnchain_tokens_spent_for_winning_block: u128,