Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename fuel-core to fuel-vm #71

Merged
merged 4 commits into from
Jun 3, 2021
Merged

Rename fuel-core to fuel-vm #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac33333
Update CI to fuel-vm.
adlerjohn Jun 3, 2021
6a2b727
Rename fuel-core to fuel-vm.
adlerjohn Jun 3, 2021
956e1ee
Update lockfile.
adlerjohn Jun 3, 2021
0231fc5
Fix.
adlerjohn Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cargo_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
uses: webfactory/ssh-agent@v0.5.2
with:
ssh-private-key: |
${{ secrets.PRIVATE_KEY_FUEL_CORE }}
${{ secrets.PRIVATE_KEY_FUEL_ASM }}
${{ secrets.PRIVATE_KEY_FUEL_TX }}
${{ secrets.PRIVATE_KEY_FUEL_VM }}

- name: Install toolchain
uses: actions-rs/toolchain@v1
Expand Down
88 changes: 76 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core_lang/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ Inflector = "0.11"
petgraph = "0.5"
uuid-b64 = "0.1"
fuel-asm = { git = "ssh://git@github.com/FuelLabs/fuel-asm.git" }
fuel-core = { git = "ssh://git@github.com/FuelLabs/fuel-core.git" }
fuel-vm = { git = "ssh://git@github.com/FuelLabs/fuel-vm.git" }
2 changes: 1 addition & 1 deletion core_lang/src/asm_lang/virtual_ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ pub enum ConstantRegister {

impl ConstantRegister {
pub(crate) fn to_register_id(&self) -> fuel_asm::RegisterId {
use fuel_core::consts::*;
use fuel_vm::consts::*;
use ConstantRegister::*;
match self {
Zero => REG_ZERO,
Expand Down
2 changes: 1 addition & 1 deletion test_suite/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ edition = "2018"
[dependencies]
forc = { path = "../forc" }
fuel-tx = { git = "ssh://git@github.com/FuelLabs/fuel-tx.git" }
fuel-core = { git = "ssh://git@github.com/FuelLabs/fuel-core.git" }
fuel-vm = { git = "ssh://git@github.com/FuelLabs/fuel-vm.git" }
fuel-asm = { git = "ssh://git@github.com/FuelLabs/fuel-asm.git" }
6 changes: 4 additions & 2 deletions test_suite/src/e2e_vm_tests/harness.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use forc;
use forc::cli::BuildCommand;

use fuel_core::interpreter::Interpreter;
use fuel_tx::Transaction;
use fuel_vm::interpreter::Interpreter;
use fuel_vm::prelude::MemoryStorage;

/// Very basic check that code does indeed run in the VM.
/// `true` if it does, `false` if not.
Expand All @@ -27,7 +28,8 @@ pub(crate) fn runs_in_vm(file_name: &str) {
);
let block_height = (u32::MAX >> 1) as u64;
tx.validate(block_height).unwrap();
Interpreter::execute_tx(tx).unwrap();
let storage = MemoryStorage::default();
Interpreter::execute_tx(storage, tx).unwrap();
}

/// Returns `true` if a file compiled without any errors or warnings,
Expand Down