Skip to content

Commit b3ae786

Browse files
authored
Merge pull request #435 from filecoin-project/chore/magik-audit-clueanups
Magik audit clueanups
2 parents e582289 + 4505acc commit b3ae786

File tree

5 files changed

+2
-18
lines changed

5 files changed

+2
-18
lines changed

fvm/src/blockstore/buffered.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,11 @@ use fvm_shared::blockstore::{Blockstore, Buffered};
99
// TODO: figure out where to put this.
1010
const DAG_CBOR: u64 = 0x71;
1111

12-
// NOTE: This code doesn't currently work. It was taken from the ipld/blockstore crate but now lives here because that "blockstore" is really the actor store.
13-
// TODO:
14-
// 1. Finish converting it to a true blockstore.
15-
// 2. Add bulk put methods to the blockstore.
16-
1712
// TODO: replace HashMap with DashMap like in forest?
1813
use std::cell::RefCell;
1914
use std::collections::HashMap;
2015
use std::io::{Cursor, Read, Seek};
2116

22-
// TODO: This is going to live in the kernel so it should be a Blockstore, not an ActorStore.
23-
2417
/// Wrapper around `Blockstore` to limit and have control over when values are written.
2518
/// This type is not threadsafe and can only be used in synchronous contexts.
2619
#[derive(Debug)]

fvm/src/call_manager/backtrace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::kernel::SyscallError;
1010
/// A call backtrace records _why_ an actor exited with a specific error code.
1111
#[derive(Debug, Default, Clone)]
1212
pub struct Backtrace {
13-
/// The actors through which this error was propegated from bottom (source) to top.
13+
/// The actors through which this error was propagated from bottom (source) to top.
1414
pub frames: Vec<Frame>,
1515
/// The last syscall error before the first actor in `frames` aborted.
1616
pub cause: Option<Cause>,

fvm/src/lib.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,13 @@ lazy_static::lazy_static! {
4545
pub struct Config {
4646
/// The maximum call depth.
4747
pub max_call_depth: u32,
48-
/// Initial number of memory pages to allocate for the invocation container.
49-
pub initial_pages: usize,
50-
/// Maximum number of memory pages an invocation container's memory
51-
/// can expand to.
52-
pub max_pages: usize,
5348
/// Whether debug mode is enabled or not.
5449
pub debug: bool,
5550
}
5651

5752
impl Default for Config {
5853
fn default() -> Self {
5954
Self {
60-
initial_pages: 0,
61-
max_pages: 1024,
6255
max_call_depth: 4096,
6356
debug: false,
6457
}

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
stable
1+
nightly

testing/conformance/src/vm.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ impl TestMachine<Box<DefaultMachine<MemoryBlockstore, TestExterns>>> {
7575
let machine = DefaultMachine::new(
7676
Config {
7777
max_call_depth: 4096,
78-
initial_pages: 0,
79-
max_pages: 1024,
8078
debug: true, // Enable debug mode by default.
8179
},
8280
engine,

0 commit comments

Comments
 (0)