kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-05-24 16:19:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: atlas + atlas tests

Browse Source
This commit is contained in:
Ludo Galabru
2021-01-28 21:40:00 -05:00
parent e078d21d77
commit d64fd6cd60
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/atlas/db.rs
View File

@@ -387,7 +387,7 @@ impl AtlasDB {
content_hash: &Hash160,
) -> Result<Option<Attachment>, db_error> {
let hex_content_hash = to_hex(&content_hash.0[..]);
let qry = "SELECT content, hash FROM attachments WHERE hash = ?1 AND was_instantiated = 0"
let qry = "SELECT content, hash FROM attachments WHERE hash = ?1 AND was_instantiated = 1"
.to_string();
let args = [&hex_content_hash as &dyn ToSql];
let row = query_row::<Attachment, _>(&self.conn, &qry, &args)?;

13
testnet/stacks-node/src/tests/neon_integrations.rs
View File

@@ -2065,7 +2065,7 @@ fn atlas_integration_test() {
"namespace-preorder",
&[
Value::buff_from(hashed_namespace.to_bytes().to_vec()).unwrap(),
Value::UInt(1000),
Value::UInt(1000000000),
],
);
@@ -2213,12 +2213,10 @@ fn atlas_integration_test() {
panic!("");
}
// From there, let's mine these transaction, and build an extra block.
// From there, let's mine these transaction, and build more blocks.
let mut sort_height = channel.get_sortitions_processed();
eprintln!("=> Sort height: {}", sort_height);
let few_blocks = sort_height + 1 + 1;
let few_blocks = sort_height + 5;
// now let's mine until the next reward cycle starts ...
while sort_height < few_blocks {
next_block_and_wait(&mut btc_regtest_controller, &blocks_processed);
sort_height = channel.get_sortitions_processed();
@@ -2237,10 +2235,9 @@ fn atlas_integration_test() {
_ => panic!("Bootstrap node could nod boot. Aborting test."),
};
// From there, let's mine these transaction, and build an extra block.
// From there, let's mine these transaction, and build more blocks.
let mut sort_height = channel.get_sortitions_processed();
eprintln!("=> Sort height: {}", sort_height);
let few_blocks = sort_height + 1 + 1;
let few_blocks = sort_height + 5;
while sort_height < few_blocks {
next_block_and_wait(&mut btc_regtest_controller, &blocks_processed);