Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-20 19:11:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix api & pool tests, add the crates to Travis

Browse source
This commit is contained in:
Ignotus Peverell 2017-07-18 17:33:49 +00:00
parent 1ede61d2a2
commit 40090fcdbc
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -20,5 +20,7 @@ env:
- TEST_DIR=p2p
- TEST_DIR=chain
- TEST_DIR=grin
- TEST_DIR=api
- TEST_DIR=pool
script: cd $TEST_DIR && cargo test --verbose

6
api/src/rest.rs
View file

@ -346,9 +346,11 @@ mod test {
impl ApiEndpoint for TestApi {
type ID = String;
type T = Animal;
type OP_IN = ();
type OP_OUT = ();
fn methods(&self) -> Vec<Method> {
vec![Method::Get]
fn operations(&self) -> Vec<Operation> {
vec![Operation::Get]
}
fn get(&self, name: String) -> ApiResult<Animal> {

16
pool/src/pool.rs
View file

@ -708,15 +708,15 @@ mod tests {
// Now we prepare the block that will cause the above condition.
// First, the transactions we want in the block:
// - Copy of 1
let mut block_tx_1 = test_transaction(vec![10], vec![8]);
let block_tx_1 = test_transaction(vec![10], vec![8]);
// - Conflict w/ 2, satisfies 7
let mut block_tx_2 = test_transaction(vec![20], vec![7]);
let block_tx_2 = test_transaction(vec![20], vec![7]);
// - Copy of 4
let mut block_tx_3 = test_transaction(vec![8], vec![4,3]);
let block_tx_3 = test_transaction(vec![8], vec![4,3]);
// - Output conflict w/ 8
let mut block_tx_4 = test_transaction(vec![40], vec![9]);
let block_transactions = vec![&mut block_tx_1, &mut block_tx_2,
&mut block_tx_3, &mut block_tx_4];
let block_tx_4 = test_transaction(vec![40], vec![9]);
let block_transactions = vec![&block_tx_1, &block_tx_2, &block_tx_3,
&block_tx_4];
let block = block::Block::new(&block::BlockHeader::default(),
block_transactions, key::ONE_KEY).unwrap();
@ -821,8 +821,8 @@ mod tests {
// TODO: This is ugly, either make block::new take owned
// txs instead of mut refs, or change
// prepare_mineable_transactions to return mut refs
let mut block_txs: Vec<transaction::Transaction> = txs.drain(..).map(|x| *x).collect();
let tx_refs = block_txs.iter_mut().collect();
let block_txs: Vec<transaction::Transaction> = txs.drain(..).map(|x| *x).collect();
let tx_refs = block_txs.iter().collect();
block = block::Block::new(&block::BlockHeader::default(),
tx_refs, key::ONE_KEY).unwrap();
}