Skip to content

Commit

Permalink
Add fuel-types dependency (#36)
Browse files Browse the repository at this point in the history
`fuel-types` is the default provider of the infrastructure common types.
  • Loading branch information
vlopes11 authored and xgreenx committed Dec 20, 2022
1 parent 430e648 commit a952578
Show file tree
Hide file tree
Showing 17 changed files with 29 additions and 29 deletions.
12 changes: 6 additions & 6 deletions fuel-tx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ description = "FuelVM transaction."

[dependencies]
fuel-asm = { git = "ssh://[email protected]/FuelLabs/fuel-asm.git", default-features = false }
fuel-data = { git = "ssh://[email protected]/FuelLabs/fuel-data.git", default-features = false }
fuel-types = { git = "ssh://[email protected]/FuelLabs/fuel-types.git", default-features = false }
itertools = { version = "0.10", optional = true }
rand = { version = "0.8", optional = true }
serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
sha2 = { version = "0.9", optional = true }

[features]
default = [ "fuel-asm/default", "fuel-data/default", "std" ]
random = [ "fuel-data/random" ]
std = [ "fuel-asm/std", "fuel-data/std", "itertools", "rand", "sha2" ]
serde-types = [ "fuel-asm/serde-types", "fuel-data/serde-types", "serde-types-minimal", "serde/default", "std" ]
serde-types-minimal = [ "fuel-asm/serde-types-minimal", "fuel-data/serde-types-minimal", "serde" ]
default = [ "fuel-asm/default", "fuel-types/default", "std" ]
random = [ "fuel-types/random" ]
std = [ "fuel-asm/std", "fuel-types/std", "itertools", "rand", "sha2" ]
serde-types = [ "fuel-asm/serde-types", "fuel-types/serde-types", "serde-types-minimal", "serde/default", "std" ]
serde-types-minimal = [ "fuel-asm/serde-types-minimal", "fuel-types/serde-types-minimal", "serde" ]

[[test]]
name = "test-bytes"
Expand Down
2 changes: 1 addition & 1 deletion fuel-tx/src/crypto.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use fuel_data::Bytes32;
use fuel_types::Bytes32;
use sha2::{Digest, Sha256};

use std::iter;
Expand Down
2 changes: 1 addition & 1 deletion fuel-tx/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

pub mod consts;

pub use fuel_data::{Address, Bytes32, Bytes4, Bytes64, Bytes8, Color, ContractId, Salt};
pub use fuel_types::{Address, Bytes32, Bytes4, Bytes64, Bytes8, Color, ContractId, Salt};

#[cfg(feature = "std")]
pub mod crypto;
Expand Down
2 changes: 1 addition & 1 deletion fuel-tx/src/transaction.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use fuel_asm::Opcode;
use fuel_data::{Bytes32, Color, ContractId, Salt, Word};
use fuel_types::{Bytes32, Color, ContractId, Salt, Word};
use itertools::Itertools;

use std::convert::TryFrom;
Expand Down
4 changes: 2 additions & 2 deletions fuel-tx/src/transaction/id.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::crypto::Hasher;
use crate::{Input, Metadata, Output, Transaction, Witness};

use fuel_data::bytes::SerializableVec;
use fuel_data::Bytes32;
use fuel_types::bytes::SerializableVec;
use fuel_types::Bytes32;

impl Transaction {
pub(crate) fn inputs_mut(&mut self) -> &mut [Input] {
Expand Down
4 changes: 2 additions & 2 deletions fuel-tx/src/transaction/metadata.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::Transaction;

use fuel_data::bytes::SizedBytes;
use fuel_data::Bytes32;
use fuel_types::bytes::SizedBytes;
use fuel_types::Bytes32;

#[derive(Debug, Clone, PartialEq, Eq, Hash)]
#[cfg_attr(
Expand Down
4 changes: 2 additions & 2 deletions fuel-tx/src/transaction/offset.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use super::{TRANSACTION_CREATE_FIXED_SIZE, TRANSACTION_SCRIPT_FIXED_SIZE};
use crate::{Input, Metadata, Transaction};

use fuel_data::bytes::{self, SizedBytes};
use fuel_data::ContractId;
use fuel_types::bytes::{self, SizedBytes};
use fuel_types::ContractId;

impl Transaction {
/// For a serialized transaction of type `Script`, return the bytes offset
Expand Down
4 changes: 2 additions & 2 deletions fuel-tx/src/transaction/receipt.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use fuel_data::bytes::{self, SizedBytes};
use fuel_data::{Address, Bytes32, Color, ContractId, Word};
use fuel_types::bytes::{self, SizedBytes};
use fuel_types::{Address, Bytes32, Color, ContractId, Word};

use std::convert::TryFrom;
use std::io::{self, Write};
Expand Down
4 changes: 2 additions & 2 deletions fuel-tx/src/transaction/txio.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use super::{TransactionRepr, TRANSACTION_CREATE_FIXED_SIZE, TRANSACTION_SCRIPT_FIXED_SIZE};
use crate::{Input, Output, Transaction, Witness};

use fuel_data::bytes::{self, SizedBytes};
use fuel_data::{ContractId, Word};
use fuel_types::bytes::{self, SizedBytes};
use fuel_types::{ContractId, Word};

use std::convert::TryFrom;
use std::{io, mem};
Expand Down
4 changes: 2 additions & 2 deletions fuel-tx/src/transaction/types/input.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use fuel_data::bytes::{self, SizedBytes};
use fuel_data::{Address, Bytes32, Color, ContractId, Word};
use fuel_types::bytes::{self, SizedBytes};
use fuel_types::{Address, Bytes32, Color, ContractId, Word};

use std::convert::TryFrom;
use std::{io, mem};
Expand Down
4 changes: 2 additions & 2 deletions fuel-tx/src/transaction/types/output.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use fuel_data::bytes::{self, SizedBytes};
use fuel_data::{Address, Bytes32, Color, ContractId, Word};
use fuel_types::bytes::{self, SizedBytes};
use fuel_types::{Address, Bytes32, Color, ContractId, Word};

use std::convert::TryFrom;
use std::{io, mem};
Expand Down
2 changes: 1 addition & 1 deletion fuel-tx/src/transaction/types/witness.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use fuel_data::{bytes, Word};
use fuel_types::{bytes, Word};

use rand::distributions::{Distribution, Standard};
use rand::Rng;
Expand Down
2 changes: 1 addition & 1 deletion fuel-tx/src/transaction/validation.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::consts::*;
use crate::{Input, Output, Transaction, Witness};

use fuel_data::{Color, Word};
use fuel_types::{Color, Word};

mod error;

Expand Down
2 changes: 1 addition & 1 deletion fuel-tx/tests/bytes.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use fuel_data::{bytes, ContractId};
use fuel_tx::*;
use fuel_types::{bytes, ContractId};
use rand::rngs::StdRng;
use rand::{Rng, RngCore, SeedableRng};
use std::fmt;
Expand Down
2 changes: 1 addition & 1 deletion fuel-tx/tests/offset_cases/factory.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use fuel_data::bytes::Deserializable;
use fuel_tx::*;
use fuel_types::bytes::Deserializable;
use rand::distributions::{Distribution, Uniform};
use rand::rngs::StdRng;
use rand::{Rng, SeedableRng};
Expand Down
2 changes: 1 addition & 1 deletion fuel-tx/tests/offset_cases/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use fuel_data::bytes::{Deserializable, SerializableVec};
use fuel_tx::*;
use fuel_types::bytes::{Deserializable, SerializableVec};

mod factory;

Expand Down
2 changes: 1 addition & 1 deletion fuel-tx/tests/valid_cases/transaction.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use fuel_data::*;
use fuel_tx::consts::*;
use fuel_tx::*;
use fuel_types::*;
use rand::rngs::StdRng;
use rand::{Rng, RngCore, SeedableRng};

Expand Down

0 comments on commit a952578

Please sign in to comment.