Skip to content

Commit

Permalink
Increase commit transaction output to pay for reveal transaction (#1242)
Browse files Browse the repository at this point in the history
  • Loading branch information
casey authored Jan 17, 2023
1 parent db570a0 commit a082b40
Show file tree
Hide file tree
Showing 13 changed files with 598 additions and 195 deletions.
3 changes: 3 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ fmt:
clippy:
cargo clippy --all --all-targets

lclippy:
cargo lclippy --all --all-targets -- -D warnings

deploy branch chain domain:
ssh root@{{domain}} "mkdir -p deploy \
&& apt-get update --yes \
Expand Down
4 changes: 2 additions & 2 deletions src/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,7 @@ mod tests {

assert_eq!(
context.index.list(OutPoint::new(txid, 0)).unwrap().unwrap(),
List::Unspent(vec![])
List::Unspent(Vec::new())
);
}

Expand All @@ -1131,7 +1131,7 @@ mod tests {

assert_eq!(
context.index.list(OutPoint::new(txid, 0)).unwrap().unwrap(),
List::Unspent(vec![])
List::Unspent(Vec::new())
);
}

Expand Down
25 changes: 14 additions & 11 deletions src/inscription.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ mod tests {

let script = builder.push_opcode(opcodes::all::OP_ENDIF).into_script();

Witness::from_vec(vec![script.into_bytes(), vec![]])
Witness::from_vec(vec![script.into_bytes(), Vec::new()])
}

#[test]
Expand All @@ -293,31 +293,34 @@ mod tests {
#[test]
fn ignore_key_path_spends() {
assert_eq!(
InscriptionParser::parse(&Witness::from_vec(vec![vec![]])),
InscriptionParser::parse(&Witness::from_vec(vec![Vec::new()])),
Err(InscriptionError::KeyPathSpend),
);
}

#[test]
fn ignore_key_path_spends_with_annex() {
assert_eq!(
InscriptionParser::parse(&Witness::from_vec(vec![vec![], vec![0x50]])),
InscriptionParser::parse(&Witness::from_vec(vec![Vec::new(), vec![0x50]])),
Err(InscriptionError::KeyPathSpend),
);
}

#[test]
fn ignore_unparsable_scripts() {
assert_eq!(
InscriptionParser::parse(&Witness::from_vec(vec![vec![0x01], vec![]])),
InscriptionParser::parse(&Witness::from_vec(vec![vec![0x01], Vec::new()])),
Err(InscriptionError::Script(script::Error::EarlyEndOfScript)),
);
}

#[test]
fn no_inscription() {
assert_eq!(
InscriptionParser::parse(&Witness::from_vec(vec![Script::new().into_bytes(), vec![]])),
InscriptionParser::parse(&Witness::from_vec(vec![
Script::new().into_bytes(),
Vec::new()
])),
Err(InscriptionError::NoInscription),
);
}
Expand Down Expand Up @@ -446,7 +449,7 @@ mod tests {
.into_script();

assert_eq!(
InscriptionParser::parse(&Witness::from_vec(vec![script.into_bytes(), vec![]])),
InscriptionParser::parse(&Witness::from_vec(vec![script.into_bytes(), Vec::new()])),
Ok(inscription("text/plain;charset=utf-8", "ord")),
);
}
Expand All @@ -466,7 +469,7 @@ mod tests {
.into_script();

assert_eq!(
InscriptionParser::parse(&Witness::from_vec(vec![script.into_bytes(), vec![]])),
InscriptionParser::parse(&Witness::from_vec(vec![script.into_bytes(), Vec::new()])),
Ok(inscription("text/plain;charset=utf-8", "ord")),
);
}
Expand All @@ -493,7 +496,7 @@ mod tests {
.into_script();

assert_eq!(
InscriptionParser::parse(&Witness::from_vec(vec![script.into_bytes(), vec![]])),
InscriptionParser::parse(&Witness::from_vec(vec![script.into_bytes(), Vec::new()])),
Ok(inscription("text/plain;charset=utf-8", "foo")),
);
}
Expand Down Expand Up @@ -521,7 +524,7 @@ mod tests {
.into_script();

assert_eq!(
InscriptionParser::parse(&Witness::from_vec(vec![script.into_bytes(), vec![]])),
InscriptionParser::parse(&Witness::from_vec(vec![script.into_bytes(), Vec::new()])),
Err(InscriptionError::NoInscription)
);
}
Expand All @@ -535,7 +538,7 @@ mod tests {
.into_script();

assert_eq!(
InscriptionParser::parse(&Witness::from_vec(vec![script.into_bytes(), vec![]])),
InscriptionParser::parse(&Witness::from_vec(vec![script.into_bytes(), Vec::new()])),
Err(InscriptionError::NoInscription)
);
}
Expand Down Expand Up @@ -607,7 +610,7 @@ mod tests {
builder = inscription("foo", [1; 100]).append_reveal_script_to_builder(builder);
builder = inscription("bar", [1; 100]).append_reveal_script_to_builder(builder);

let witness = Witness::from_vec(vec![builder.into_script().into_bytes(), vec![]]);
let witness = Witness::from_vec(vec![builder.into_script().into_bytes(), Vec::new()]);

let tx = Transaction {
version: 0,
Expand Down
10 changes: 10 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,16 @@ mod test;
#[cfg(test)]
use self::test::*;

macro_rules! tprintln {
($($arg:tt)*) => {

if cfg!(test) {
eprint!("==> ");
eprintln!($($arg)*);
}
};
}

mod arguments;
mod blocktime;
mod chain;
Expand Down
3 changes: 2 additions & 1 deletion src/subcommand/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1738,7 +1738,8 @@ mod tests {

#[test]
fn content_response_no_content_type() {
let (headers, body) = Server::content_response(Inscription::new(None, Some(vec![]))).unwrap();
let (headers, body) =
Server::content_response(Inscription::new(None, Some(Vec::new()))).unwrap();

assert_eq!(headers["content-type"], "application/octet-stream");
assert!(body.is_empty());
Expand Down
Loading

0 comments on commit a082b40

Please sign in to comment.