Skip to content
This repository has been archived by the owner on Sep 13, 2022. It is now read-only.

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
yejiayu committed Feb 7, 2020
1 parent 7255889 commit 0d66c09
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
28 changes: 14 additions & 14 deletions core/api/src/schema/block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::schema::{Address, Bytes, Hash, MerkleRoot, Uint64};
)]
pub struct Block {
#[graphql(description = "The header section of a block")]
header: BlockHeader,
header: BlockHeader,
#[graphql(description = "The body section of a block")]
ordered_tx_hashes: Vec<Hash>,
}
Expand All @@ -20,31 +20,31 @@ pub struct BlockHeader {
#[graphql(
description = "Identifier of a chain in order to prevent replay attacks across channels "
)]
pub chain_id: Hash,
pub chain_id: Hash,
#[graphql(description = "block height")]
pub height: Uint64,
pub height: Uint64,
#[graphql(description = "The height to which the block has been executed")]
pub exec_height: Uint64,
pub exec_height: Uint64,
#[graphql(description = "The hash of the serialized previous block")]
pub pre_hash: Hash,
pub pre_hash: Hash,
#[graphql(description = "A timestamp that records when the block was created")]
pub timestamp: Uint64,
pub timestamp: Uint64,
#[graphql(description = "The merkle root of ordered transactions")]
pub order_root: MerkleRoot,
pub order_root: MerkleRoot,
#[graphql(description = "The merkle roots of all the confirms")]
pub confirm_root: Vec<MerkleRoot>,
pub confirm_root: Vec<MerkleRoot>,
#[graphql(description = "The merkle root of state root")]
pub state_root: MerkleRoot,
pub state_root: MerkleRoot,
#[graphql(description = "The merkle roots of receipts")]
pub receipt_root: Vec<MerkleRoot>,
pub receipt_root: Vec<MerkleRoot>,
#[graphql(description = "The sum of all transactions costs")]
pub cycles_used: Vec<Uint64>,
pub cycles_used: Vec<Uint64>,
#[graphql(description = "The address descirbed who packed the block")]
pub proposer: Address,
pub proof: Proof,
pub proposer: Address,
pub proof: Proof,
#[graphql(description = "The version of validator is designed for cross chain")]
pub validator_version: Uint64,
pub validators: Vec<Validator>,
pub validators: Vec<Validator>,
}

#[derive(juniper::GraphQLObject, Clone)]
Expand Down
14 changes: 7 additions & 7 deletions core/api/src/schema/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl From<protocol::types::SignedTransaction> for SignedTransaction {
InputRawTransaction describes information above")]
pub struct InputRawTransaction {
#[graphql(description = "Identifier of the chain.")]
pub chain_id: Hash,
pub chain_id: Hash,
#[graphql(
description = "Mostly like the gas limit in Ethereum, describes the fee that \
you are willing to pay the highest price for the transaction"
Expand All @@ -57,24 +57,24 @@ pub struct InputRawTransaction {
description = "Every transaction has its own id, unlike Ethereum's nonce,\
the nonce in Muta is an hash"
)]
pub nonce: Hash,
pub nonce: Hash,
#[graphql(description = "For security and performance reasons, \
Muta will only deal with trade request over a period of time,\
the `timeout` should be `timeout > current_block_height` and `timeout < current_block_height + timeout_gap`,\
the `timeout_gap` generally equal to 20.")]
pub timeout: Uint64,
pub timeout: Uint64,
pub service_name: String,
pub method: String,
pub payload: String,
pub method: String,
pub payload: String,
}

#[derive(juniper::GraphQLInputObject, Clone)]
#[graphql(description = "Signature of the transaction")]
pub struct InputTransactionEncryption {
#[graphql(description = "The digest of the transaction")]
pub tx_hash: Hash,
pub tx_hash: Hash,
#[graphql(description = "The public key of transfer")]
pub pubkey: Bytes,
pub pubkey: Bytes,
#[graphql(description = "The signature of the transaction")]
pub signature: Bytes,
}
Expand Down

0 comments on commit 0d66c09

Please sign in to comment.