diff --git a/integration_test/random_ms.txt b/integration_test/random_ms.txt index 5156d8f13..4aa5d4fc8 100644 --- a/integration_test/random_ms.txt +++ b/integration_test/random_ms.txt @@ -13,7 +13,7 @@ j:and_v(v:ripemd160(H),or_d(sha256(H),older(16))) and_b(hash256(H),a:and_b(hash256(H),a:older(1))) thresh(2,multi(2,03a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00),a:multi(1,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00),ac:pk_k(022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a01)) and_n(sha256(H),t:or_i(v:older(4252898),v:older(16))) -or_d(d:and_v(v:older(4252898),v:older(4252898)),sha256(H)) +or_d(nd:and_v(v:older(4252898),v:older(4252898)),sha256(H)) c:and_v(or_c(sha256(H),v:multi(1,02c44d12c7065d812e8acf28d7cbb19f9011ecd9e9fdf281b0e6a3b5e87d22e7db)),pk_k(03acd484e2f0c7f65309ad178a9f559abde09796974c57e714c35f110dfc27ccbe)) c:and_v(or_c(multi(2,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00,02352bbf4a4cdd12564f93fa332ce333301d9ad40271f8107181340aef25be59d5),v:ripemd160(H)),pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556)) and_v(andor(hash256(H),v:hash256(H),v:older(50000)),after(1231488000)) diff --git a/src/miniscript/mod.rs b/src/miniscript/mod.rs index c20ed8938..ee26e37a6 100644 --- a/src/miniscript/mod.rs +++ b/src/miniscript/mod.rs @@ -615,7 +615,7 @@ mod tests { ms_attributes_test("and_b(hash256(32ba476771d01e37807990ead8719f08af494723de1d228f2c2c07cc0aa40bac),a:and_b(hash256(131772552c01444cd81360818376a040b7c3b2b7b0a53550ee3edde216cec61b),a:older(1)))", "82012088aa2032ba476771d01e37807990ead8719f08af494723de1d228f2c2c07cc0aa40bac876b82012088aa20131772552c01444cd81360818376a040b7c3b2b7b0a53550ee3edde216cec61b876b51b26c9a6c9a", true, true, false, 15, 2); ms_attributes_test("thresh(2,multi(2,03a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00),a:multi(1,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00),ac:pk_k(022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a01))", "522103a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c721036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a0052ae6b5121036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a0051ae6c936b21022f01e5e15cca351daff3843fb70f3c2f0a1bdd05e5af888a67784ef3e10a2a01ac6c935287", true, true, true, 13, 6); ms_attributes_test("and_n(sha256(d1ec675902ef1633427ca360b290b0b3045a0d9058ddb5e648b4c3c3224c5c68),t:or_i(v:older(4252898),v:older(144)))", "82012088a820d1ec675902ef1633427ca360b290b0b3045a0d9058ddb5e648b4c3c3224c5c68876400676303e2e440b26967029000b269685168", true, false, false, 14, 2); - ms_attributes_test("or_d(d:and_v(v:older(4252898),v:older(4252898)),sha256(38df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b6))", "766303e2e440b26903e2e440b26968736482012088a82038df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b68768", true, false, false, 14, 2); + ms_attributes_test("or_d(nd:and_v(v:older(4252898),v:older(4252898)),sha256(38df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b6))", "766303e2e440b26903e2e440b2696892736482012088a82038df1c1f64a24a77b23393bca50dff872e31edc4f3b5aa3b90ad0b82f4f089b68768", true, false, false, 15, 2); ms_attributes_test("c:and_v(or_c(sha256(9267d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed2),v:multi(1,02c44d12c7065d812e8acf28d7cbb19f9011ecd9e9fdf281b0e6a3b5e87d22e7db)),pk_k(03acd484e2f0c7f65309ad178a9f559abde09796974c57e714c35f110dfc27ccbe))", "82012088a8209267d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed28764512102c44d12c7065d812e8acf28d7cbb19f9011ecd9e9fdf281b0e6a3b5e87d22e7db51af682103acd484e2f0c7f65309ad178a9f559abde09796974c57e714c35f110dfc27ccbeac", true, false, true, 9, 2); ms_attributes_test("c:and_v(or_c(multi(2,036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a00,02352bbf4a4cdd12564f93fa332ce333301d9ad40271f8107181340aef25be59d5),v:ripemd160(1b0f3c404d12075c68c938f9f60ebea4f74941a0)),pk_k(03fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556))", "5221036d2b085e9e382ed10b69fc311a03f8641ccfff21574de0927513a49d9a688a002102352bbf4a4cdd12564f93fa332ce333301d9ad40271f8107181340aef25be59d552ae6482012088a6141b0f3c404d12075c68c938f9f60ebea4f74941a088682103fff97bd5755eeea420453a14355235d382f6472f8568a18b2f057a1460297556ac", true, true, true, 10, 5); ms_attributes_test("and_v(andor(hash256(8a35d9ca92a48eaade6f53a64985e9e2afeb74dcf8acb4c3721e0dc7e4294b25),v:hash256(939894f70e6c3a25da75da0cc2071b4076d9b006563cf635986ada2e93c0d735),v:older(50000)),after(499999999))", "82012088aa208a35d9ca92a48eaade6f53a64985e9e2afeb74dcf8acb4c3721e0dc7e4294b2587640350c300b2696782012088aa20939894f70e6c3a25da75da0cc2071b4076d9b006563cf635986ada2e93c0d735886804ff64cd1db1", true, false, false, 14, 2); diff --git a/src/miniscript/ms_tests.rs b/src/miniscript/ms_tests.rs index de95fdaff..ccc60d2c4 100644 --- a/src/miniscript/ms_tests.rs +++ b/src/miniscript/ms_tests.rs @@ -1298,7 +1298,7 @@ mod tests { invalid_ms("d:and_b(a:after(1),multi(2,A,B,C))"); invalid_ms("dsj:pk_h(A)"); invalid_ms("thresh(2,after(500000001),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))"); - invalid_ms("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(500000001))"); + invalid_ms("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(500000001))"); invalid_ms("dvs:or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1))"); invalid_ms("or_d(or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C))),after(1))"); invalid_ms("ds:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))"); @@ -1382,7 +1382,7 @@ mod tests { invalid_ms("or_d(after(500000001),and_v(after(500000001),after(500000001)))"); invalid_ms("or_b(s:multi(2,A,B,C),or_b(after(1),pk_k(D)))"); invalid_ms("thresh(2,after(1),s:pk_h(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))"); - invalid_ms("or_b(dv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))"); + invalid_ms("or_b(ndv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))"); invalid_ms("or_d(or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)),multi(2,A,B,C))"); invalid_ms("or_d(pk_h(A),s:or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,B,C,D)))"); invalid_ms("or_d(pk_k(A),or_d(after(1),after(1)))"); @@ -2749,7 +2749,7 @@ mod tests { invalid_ms("or_d(or_c(after(500000001),after(500000001)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))"); invalid_ms("and_v(or_d(after(500000001),after(500000001)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))"); invalid_ms("and_v(c:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),1)"); - invalid_ms("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(1))"); + invalid_ms("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(1))"); invalid_ms("d:and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1))"); invalid_ms("thresh(2,after(500000001),or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))"); invalid_ms("thresh(2,c:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),multi(2,A,B,C))"); @@ -3058,7 +3058,7 @@ mod tests { invalid_ms("or_b(pk_k(A),thresh(2,multi(2,B,C,D),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,E,F,G)))"); invalid_ms("thresh(2,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),pk_h(A))"); invalid_ms("or_b(s:pk_k(A),v:after(1))"); - invalid_ms("or_b(pk_k(A),dv:after(1))"); + invalid_ms("or_b(pk_k(A),ndv:after(1))"); invalid_ms("andor(s:multi(2,A,B,C),multi(2,D,E,F),multi(2,G,I,J))"); invalid_ms("or_b(pk_k(A),j:pk_h(B))"); invalid_ms("or_b(j:multi(2,A,B,C),after(1))"); @@ -4451,7 +4451,7 @@ mod tests { invalid_ms("or_d(multi(2,A,B,C),s:or_c(after(500000001),multi(2,D,E,F)))"); invalid_ms("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_v(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),pk_k(A)))"); invalid_ms("nsv:pk_h(A)"); - invalid_ms("or_b(dv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))"); + invalid_ms("or_b(ndv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))"); invalid_ms("and_v(pk_h(A),after(1))"); invalid_ms("or_d(after(1),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)))"); invalid_ms("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))"); @@ -4819,7 +4819,7 @@ mod tests { invalid_ms("or_d(or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:pk_k(A)),after(500000001))"); invalid_ms("nj:after(500000001)"); invalid_ms("thresh(2,pk_h(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))"); - invalid_ms("or_b(dv:after(500000001),multi(2,A,B,C))"); + invalid_ms("or_b(ndv:after(500000001),multi(2,A,B,C))"); invalid_ms("or_d(or_c(or_d(after(500000001),after(500000001)),after(500000001)),after(500000001))"); invalid_ms("or_d(n:or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)),after(500000001))"); invalid_ms("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_b(s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))"); @@ -5698,7 +5698,7 @@ mod tests { ms_test("andor(or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C),after(500000001))", "B"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(0,multi(2,A,B,C)),after(1))", "B"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),jc:pk_k(A))", "Bdu"); - ms_test("andor(dv:after(500000001),after(500000001),after(500000001))", "oBf"); + ms_test("andor(ndv:after(500000001),after(500000001),after(500000001))", "oBf"); ms_test("andor(j:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0)", "sdueB"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)),after(500000001))", "Bf"); ms_test("c:andor(j:multi(2,A,B,C),pk_h(D),pk_h(E))", "sdueB"); @@ -5714,14 +5714,14 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),jc:pk_k(A))", "Bd"); ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,A,B,C))", "Bdue"); ms_test("andor(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001),after(1))", "Bf"); - ms_test("or_d(dv:after(500000001),after(500000001))", "oBf"); + ms_test("or_d(ndv:after(500000001),after(500000001))", "oBf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1),jc:pk_h(A))", "Bd"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "Bf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,A,B,C),c:pk_h(D))", "Bdus"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A),c:pk_k(B))", "Bdus"); ms_test("and_v(v:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)),1)", "oBfu"); - ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(1))", "Bdue"); + ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(1))", "Bdue"); ms_test("or_d(or_b(multi(2,A,B,C),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F))", "Bdue"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,A,B,C),n:after(1))", "Bu"); ms_test("or_d(or_d(j:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); @@ -5747,7 +5747,7 @@ mod tests { ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1),after(1)))", "Bf"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(and_b(after(1),a:after(1)),a:after(1)),after(1))", "Bf"); - ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(1))", "Bdue"); + ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(1))", "Bdue"); ms_test("and_b(after(1),a:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(c:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bd"); @@ -5766,13 +5766,13 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),n:after(500000001))", "oBf"); ms_test("andor(j:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F))", "sdueB"); ms_test("or_d(or_b(multi(2,A,B,C),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),dv:after(500000001))", "Bdu"); + ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),ndv:after(500000001))", "Bdu"); ms_test("or_d(or_i(multi(2,A,B,C),0),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,A,B,C))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),after(500000001)),after(500000001))", "Bf"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A)),after(1))", "Bf"); ms_test("n:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A),after(500000001))", "Bu"); - ms_test("or_d(dv:after(500000001),after(500000001))", "oBf"); + ms_test("or_d(ndv:after(500000001),after(500000001))", "oBf"); ms_test("or_d(and_b(multi(2,A,B,C),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); @@ -5988,7 +5988,7 @@ mod tests { ms_test("or_b(multi(2,A,B,C),a:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); - ms_test("andor(dv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001))", "B"); + ms_test("andor(ndv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001))", "B"); ms_test("andor(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "B"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_b(multi(2,A,B,C),a:multi(2,D,E,F)))", "Bdue"); @@ -6004,7 +6004,7 @@ mod tests { ms_test("or_d(or_b(multi(2,A,B,C),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F))", "Bdue"); ms_test("or_d(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),c:pk_k(D))", "Bdue"); ms_test("andor(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001),multi(2,A,B,C))", "Bde"); - ms_test("or_b(dv:after(1),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_b(ndv:after(1),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("andor(or_i(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),multi(2,A,B,C),after(500000001))", "B"); ms_test("or_d(multi(2,A,B,C),or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("or_b(multi(2,A,B,C),a:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); @@ -6014,7 +6014,7 @@ mod tests { ms_test("or_d(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "Bf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),c:pk_h(D)))", "Bdue"); ms_test("or_b(jc:pk_k(A),a:multi(2,B,C,D))", "sdueB"); - ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(1))", "Bdu"); + ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(1))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)))", "Bde"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),after(1)))", "B"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); @@ -6167,7 +6167,7 @@ mod tests { ms_test("c:andor(j:multi(2,A,B,C),pk_k(D),pk_k(E))", "sdueB"); ms_test("and_v(v:after(500000001),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "oBf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("or_b(dv:after(500000001),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_b(ndv:after(500000001),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),after(500000001))", "B"); ms_test("n:or_d(j:multi(2,A,B,C),after(1))", "Bfu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bd"); @@ -6201,7 +6201,7 @@ mod tests { ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ac:pk_h(A))", "Bdue"); ms_test("or_d(or_b(multi(2,A,B,C),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "Bf"); ms_test("or_d(and_b(multi(2,A,B,C),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("andor(dv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("andor(ndv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(jc:pk_h(A),after(500000001),after(1))", "Bf"); ms_test("n:or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),after(500000001))", "Bfu"); ms_test("andor(multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),after(500000001))", "Bf"); @@ -6213,7 +6213,7 @@ mod tests { ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),multi(2,D,E,F))", "Bdue"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "B"); ms_test("or_d(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "Bf"); - ms_test("or_d(dv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("or_d(ndv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(j:multi(2,A,B,C),multi(2,D,E,F),j:multi(2,G,I,J))", "Bdus"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),after(1)))", "Bf"); @@ -6300,7 +6300,7 @@ mod tests { ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),c:pk_k(A))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),0))", "Bdu"); ms_test("andor(multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); - ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(1))", "Bdue"); + ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(1))", "Bdue"); ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ac:pk_k(A))", "Bdue"); ms_test("or_i(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)),0)", "Bde"); @@ -6310,12 +6310,12 @@ mod tests { ms_test("or_b(j:multi(2,A,B,C),aj:multi(2,D,E,F))", "sdueB"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(after(500000001),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bu"); ms_test("or_d(or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("andor(dv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("andor(ndv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("and_b(after(500000001),a:and_b(after(500000001),a:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),after(500000001))))", "Bfu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("or_d(j:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_b(andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); - ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(500000001))", "Bdue"); + ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(500000001))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:after(1)))", "Bu"); ms_test("n:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),after(500000001))", "oBfu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),c:pk_k(A))", "Bde"); @@ -6388,7 +6388,7 @@ mod tests { ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(multi(2,A,B,C),after(1),after(500000001)))", "Bf"); ms_test("or_b(or_i(after(1),0),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("andor(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),multi(2,D,E,F),after(1))", "B"); - ms_test("or_b(dv:after(500000001),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_b(ndv:after(500000001),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_b(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),after(500000001))", "B"); ms_test("andor(or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); @@ -6398,7 +6398,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A))", "Bdu"); ms_test("or_d(multi(2,A,B,C),or_d(j:multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),multi(2,D,E,F)),after(1))", "B"); - ms_test("andor(dv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("andor(ndv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(jc:pk_h(A),after(1),multi(2,B,C,D))", "Bdse"); ms_test("or_d(or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,A,B,C)),after(1))", "Bf"); ms_test("or_d(multi(2,A,B,C),or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); @@ -6452,7 +6452,7 @@ mod tests { ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(after(1),0))", "Bde"); ms_test("c:andor(j:multi(2,A,B,C),pk_h(D),pk_k(E))", "sdueB"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),j:multi(2,A,B,C))", "Bdu"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),adv:after(1))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andv:after(1))", "Bdue"); ms_test("or_d(or_i(0,multi(2,A,B,C)),after(1))", "Bf"); ms_test("thresh(2,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,A,B,C))", "Bdu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(A))", "Bdue"); @@ -6499,7 +6499,7 @@ mod tests { ms_test("andor(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001))", "B"); ms_test("or_d(or_b(multi(2,A,B,C),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(or_i(c:pk_k(A),0),multi(2,B,C,D))", "sdueB"); - ms_test("or_b(dv:after(1),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_b(ndv:after(1),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_d(or_d(c:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),n:after(1),after(1))", "oBf"); @@ -6568,7 +6568,7 @@ mod tests { ms_test("andor(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1),after(500000001))", "oBf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bd"); - ms_test("or_d(dvn:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("or_d(ndvn:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(or_d(c:pk_h(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(and_b(multi(2,A,B,C),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F))", "sdueB"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),n:after(1))", "Bu"); @@ -6581,7 +6581,7 @@ mod tests { ms_test("and_b(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_i(0,andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "Bd"); ms_test("n:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1),after(1))", "oBfu"); - ms_test("or_d(j:multi(2,A,B,C),dv:after(500000001))", "Bdue"); + ms_test("or_d(j:multi(2,A,B,C),ndv:after(500000001))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(after(500000001),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bu"); ms_test("or_d(or_i(c:pk_h(A),0),multi(2,B,C,D))", "sdueB"); ms_test("or_d(and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C))", "Bdue"); @@ -6690,7 +6690,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),after(1))", "Bf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)))", "B"); ms_test("thresh(2,multi(2,A,B,C),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),adv:after(1))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andv:after(1))", "Bdue"); ms_test("andor(multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "Bf"); ms_test("andor(j:multi(2,A,B,C),after(1),after(500000001))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,A,B,C),n:after(1))", "Bu"); @@ -6738,7 +6738,7 @@ mod tests { ms_test("or_d(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F))", "Bdue"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("n:or_d(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "Bfu"); - ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(500000001))", "Bdue"); + ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(500000001))", "Bdue"); ms_test("or_d(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),c:pk_k(D))", "Bdue"); ms_test("andor(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F),after(500000001))", "B"); ms_test("or_d(c:pk_h(A),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,B,C,D)))", "Bdue"); @@ -6768,7 +6768,7 @@ mod tests { ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("or_d(or_d(c:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(after(1),a:and_b(after(1),a:after(1))),after(1))", "Bf"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),adv:after(500000001))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andv:after(500000001))", "Bdue"); ms_test("or_d(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); ms_test("andor(or_i(multi(2,A,B,C),0),after(500000001),after(500000001))", "Bf"); ms_test("or_d(or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,A,B,C)),after(500000001))", "Bf"); @@ -6788,7 +6788,7 @@ mod tests { ms_test("or_b(jc:pk_h(A),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_d(or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sc:pk_k(A)),multi(2,B,C,D))", "Bdue"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("or_b(dv:after(500000001),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_b(ndv:after(500000001),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_d(j:multi(2,A,B,C),c:pk_k(D))", "sdueB"); ms_test("andor(j:multi(2,A,B,C),c:pk_k(D),after(1))", "Bf"); ms_test("or_d(or_i(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); @@ -6796,7 +6796,7 @@ mod tests { ms_test("andor(jc:pk_k(A),after(1),multi(2,B,C,D))", "Bdse"); ms_test("c:andor(j:multi(2,A,B,C),pk_h(D),pk_k(E))", "sdueB"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(multi(2,A,B,C),after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bd"); - ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_b(c:pk_h(A),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(0,multi(2,A,B,C)))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,A,B,C),c:pk_k(D))", "Bdus"); @@ -6822,7 +6822,7 @@ mod tests { ms_test("or_d(jc:pk_h(A),c:pk_k(B))", "sdueB"); ms_test("or_i(or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),0)", "Bdu"); ms_test("andor(j:multi(2,A,B,C),after(1),0)", "Bdse"); - ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(500000001))", "Bdu"); + ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(500000001))", "Bdu"); ms_test("n:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),j:multi(2,A,B,C))", "Bdu"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))),c:pk_k(A))", "Bdue"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),j:multi(2,D,E,F))", "Bdus"); @@ -6850,8 +6850,8 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,A,B,C),multi(2,D,E,F))", "Bdus"); ms_test("andor(j:multi(2,A,B,C),j:multi(2,D,E,F),after(1))", "Bf"); ms_test("thresh(2,multi(2,A,B,C),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("or_b(dv:after(1),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); - ms_test("or_d(dv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("or_b(ndv:after(1),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_d(ndv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("and_v(or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),v:after(1)),1)", "oBfu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),multi(2,D,E,F)),after(500000001))", "B"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A),after(1))", "B"); @@ -6918,7 +6918,7 @@ mod tests { ms_test("andor(j:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),after(1))", "Bf"); ms_test("andor(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bd"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),adv:after(500000001))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andv:after(500000001))", "Bdue"); ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("andor(jc:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,B,C,D))", "sdueB"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),after(500000001)))", "Bf"); @@ -6981,7 +6981,7 @@ mod tests { ms_test("c:andor(j:multi(2,A,B,C),pk_h(D),pk_k(E))", "sdueB"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(0,after(1)))", "Bde"); - ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dvn:after(500000001))", "Bdue"); + ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndvn:after(500000001))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(multi(2,A,B,C),a:multi(2,D,E,F)))", "Bdue"); ms_test("or_b(multi(2,A,B,C),a:or_d(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("and_v(v:after(500000001),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bu"); @@ -6996,7 +6996,7 @@ mod tests { ms_test("or_d(multi(2,A,B,C),or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(c:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("or_d(andor(multi(2,A,B,C),multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("or_b(dv:after(1),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_b(ndv:after(1),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("andor(j:multi(2,A,B,C),c:pk_h(D),after(500000001))", "Bf"); ms_test("or_d(or_i(0,c:pk_k(A)),after(1))", "Bf"); ms_test("or_b(jc:pk_k(A),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); @@ -7009,7 +7009,7 @@ mod tests { ms_test("or_b(jc:pk_k(A),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_d(multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("or_d(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); - ms_test("or_d(j:multi(2,A,B,C),dv:after(1))", "Bdue"); + ms_test("or_d(j:multi(2,A,B,C),ndv:after(1))", "Bdue"); ms_test("or_b(or_i(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("andor(j:multi(2,A,B,C),j:multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F),multi(2,G,I,J))", "Bdus"); @@ -7035,7 +7035,7 @@ mod tests { ms_test("and_v(or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bu"); ms_test("andor(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bd"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(A),c:pk_k(B))", "Bdus"); - ms_test("andor(dv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("andor(ndv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(multi(2,A,B,C),or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "B"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A),after(500000001))", "B"); @@ -7058,12 +7058,12 @@ mod tests { ms_test("or_d(andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(A)),after(1))", "Bf"); - ms_test("or_d(dv:after(500000001),after(1))", "oBf"); + ms_test("or_d(ndv:after(500000001),after(1))", "oBf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(after(500000001),a:after(500000001)))", "Bfu"); ms_test("or_d(j:multi(2,A,B,C),or_i(0,or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(A),c:pk_h(B))", "Bdus"); ms_test("andor(j:multi(2,A,B,C),c:pk_k(D),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("or_d(dv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("or_d(ndv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(jc:pk_k(A),after(1),after(500000001))", "oBf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(after(1),0),multi(2,A,B,C))", "Bd"); ms_test("or_d(multi(2,A,B,C),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bd"); @@ -7077,7 +7077,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,A,B,C),after(1))", "B"); ms_test("or_d(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bd"); - ms_test("andor(dv:after(1),after(1),after(1))", "oBf"); + ms_test("andor(ndv:after(1),after(1),after(1))", "oBf"); ms_test("or_b(or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(c:pk_h(A),after(1)))", "Bf"); ms_test("n:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A),after(500000001))", "Bu"); @@ -7166,7 +7166,7 @@ mod tests { ms_test("n:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),after(1))", "oBfu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C))", "Bdu"); ms_test("or_d(jc:pk_h(A),j:multi(2,B,C,D))", "Bdus"); - ms_test("or_d(dv:after(1),after(500000001))", "oBf"); + ms_test("or_d(ndv:after(1),after(500000001))", "oBf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(0,after(500000001)))", "Bde"); ms_test("andor(j:multi(2,A,B,C),after(500000001),multi(2,D,E,F))", "Bdse"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "B"); @@ -7339,7 +7339,7 @@ mod tests { ms_test("andor(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bd"); ms_test("or_d(or_i(0,c:pk_h(A)),multi(2,B,C,D))", "sdueB"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),n:after(1))", "Bu"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),adv:after(500000001))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andv:after(500000001))", "Bdue"); ms_test("or_d(multi(2,A,B,C),or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("n:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),after(500000001))", "Bu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),multi(2,D,E,F)))", "Bdue"); @@ -7359,7 +7359,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1),or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bd"); - ms_test("or_d(dv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("or_d(ndv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(j:multi(2,A,B,C),after(500000001))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)))", "Bde"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(after(1),a:after(1)))", "Bfu"); @@ -7408,7 +7408,7 @@ mod tests { ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(multi(2,A,B,C),a:after(1)))", "Bu"); ms_test("andor(multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("andor(dv:after(500000001),after(500000001),after(500000001))", "oBf"); + ms_test("andor(ndv:after(500000001),after(500000001),after(500000001))", "oBf"); ms_test("and_b(andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(A),andor(c:pk_h(B),after(500000001),after(500000001))),a:after(500000001))", "Bu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C))", "Bdu"); ms_test("or_d(or_d(c:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); @@ -7439,7 +7439,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),c:pk_h(D))", "Bdus"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(multi(2,A,B,C),or_b(multi(2,D,E,F),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); - ms_test("andor(dv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1))", "B"); + ms_test("andor(ndv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1))", "B"); ms_test("and_v(or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),v:after(1)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bu"); ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:or_i(after(1),0))", "Bdue"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "Bf"); @@ -7486,7 +7486,7 @@ mod tests { ms_test("or_d(or_i(0,multi(2,A,B,C)),after(500000001))", "Bf"); ms_test("n:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001))", "Bu"); ms_test("or_d(andor(multi(2,A,B,C),multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sdv:after(500000001))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sndv:after(500000001))", "Bdue"); ms_test("thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdus"); ms_test("or_d(c:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),pk_k(A),pk_h(B)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),after(500000001))", "Bf"); @@ -7569,7 +7569,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),multi(2,D,E,F)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("and_b(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)),a:after(500000001))", "Bfu"); ms_test("thresh(2,multi(2,A,B,C),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,D,E,F))", "Bdus"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sdv:after(1))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sndv:after(1))", "Bdue"); ms_test("and_b(multi(2,A,B,C),a:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "sduBn"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(j:multi(2,A,B,C),multi(2,D,E,F)))", "Bdue"); ms_test("or_b(jc:pk_h(A),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); @@ -7762,7 +7762,7 @@ mod tests { ms_test("andor(jc:pk_h(A),multi(2,B,C,D),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(after(1),0))", "Bd"); - ms_test("or_d(dvn:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("or_d(ndvn:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bd"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_v(v:multi(2,A,B,C),1))", "Bfu"); ms_test("n:andor(j:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1))", "Bfu"); @@ -7794,7 +7794,7 @@ mod tests { ms_test("or_b(jc:pk_h(A),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_d(or_b(multi(2,A,B,C),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "Bf"); ms_test("or_d(or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,A,B,C)),multi(2,D,E,F))", "Bdue"); - ms_test("or_b(dv:after(500000001),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_b(ndv:after(500000001),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_b(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "B"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),jc:pk_k(A))", "Bdu"); @@ -7812,7 +7812,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),jc:pk_k(A),after(1))", "B"); ms_test("or_b(or_d(multi(2,A,B,C),multi(2,D,E,F)),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_d(andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); - ms_test("andor(dv:after(1),after(1),after(1))", "oBf"); + ms_test("andor(ndv:after(1),after(1),after(1))", "oBf"); ms_test("andor(j:multi(2,A,B,C),c:pk_h(D),after(1))", "Bf"); ms_test("and_v(v:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(c:pk_h(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); @@ -7867,7 +7867,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,G,I,J)))", "Bdue"); ms_test("or_d(jc:pk_h(A),after(500000001))", "Bf"); ms_test("andor(jc:pk_h(A),after(1),after(1))", "Bf"); - ms_test("or_d(dv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("or_d(ndv:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("n:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1),c:pk_h(A))", "Bdue"); ms_test("and_v(or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),v:after(500000001)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bu"); @@ -7893,7 +7893,7 @@ mod tests { ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)))", "Bdue"); ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)))", "Bdue"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sdv:after(500000001))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sndv:after(500000001))", "Bdue"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),multi(2,D,E,F))", "Bdue"); ms_test("or_b(jc:pk_h(A),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "Bf"); @@ -7925,7 +7925,7 @@ mod tests { ms_test("or_d(j:multi(2,A,B,C),multi(2,D,E,F))", "sdueB"); ms_test("or_b(multi(2,A,B,C),ajc:pk_h(D))", "sdueB"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),after(500000001))", "B"); - ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),dv:after(1))", "Bdu"); + ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),ndv:after(1))", "Bdu"); ms_test("or_d(j:multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)))", "Bdue"); ms_test("or_b(multi(2,A,B,C),a:or_d(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A)),after(500000001))", "Bf"); @@ -8074,7 +8074,7 @@ mod tests { ms_test("or_b(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),a:multi(2,D,E,F))", "Bdue"); ms_test("or_b(jc:pk_k(A),a:multi(2,B,C,D))", "sdueB"); ms_test("or_d(jc:pk_k(A),after(1))", "oBf"); - ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dvn:after(1))", "Bdue"); + ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndvn:after(1))", "Bdue"); ms_test("or_d(jc:pk_h(A),n:after(1))", "Bfu"); ms_test("andor(or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); @@ -8087,7 +8087,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),n:after(500000001),after(500000001))", "oBf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); - ms_test("or_b(dv:after(500000001),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_b(ndv:after(500000001),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("n:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),after(500000001))", "oBfu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "B"); ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)))", "Bdue"); @@ -8225,7 +8225,7 @@ mod tests { ms_test("or_b(or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:or_d(multi(2,A,B,C),multi(2,D,E,F)))", "Bdue"); ms_test("or_b(multi(2,A,B,C),a:and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,D,E,F)))", "sdueB"); - ms_test("or_d(dv:after(1),after(1))", "oBf"); + ms_test("or_d(ndv:after(1),after(1))", "oBf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),n:after(500000001)))", "Bfu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "B"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(c:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); @@ -8269,7 +8269,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),multi(2,D,E,F)),after(500000001))", "B"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A))", "Bdu"); ms_test("or_d(multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "Bf"); - ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(1))", "Bdu"); + ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(1))", "Bdu"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(A)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),after(500000001)))", "Bf"); @@ -8296,7 +8296,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)),after(500000001))", "Bf"); ms_test("or_d(and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,A,B,C)),multi(2,D,E,F))", "sdueB"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),after(500000001)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bd"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sdv:after(1))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sndv:after(1))", "Bdue"); ms_test("or_d(c:pk_h(A),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "Bf"); ms_test("or_d(or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,A,B,C))", "Bdu"); @@ -8337,7 +8337,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),after(1),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bd"); ms_test("or_d(or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C))", "Bdue"); ms_test("and_v(or_c(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),vc:pk_k(A)),c:pk_h(B))", "Bsu"); - ms_test("or_d(dv:after(1),after(500000001))", "oBf"); + ms_test("or_d(ndv:after(1),after(500000001))", "oBf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "B"); ms_test("or_d(andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "Bf"); @@ -8348,7 +8348,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A),multi(2,B,C,D))", "Bdus"); ms_test("or_b(or_d(c:pk_h(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "nB"); - ms_test("or_b(dv:after(500000001),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_b(ndv:after(500000001),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("andor(j:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(D))", "sdueB"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("or_d(or_i(0,multi(2,A,B,C)),after(500000001))", "Bf"); @@ -8395,7 +8395,7 @@ mod tests { ms_test("or_d(or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A),n:after(500000001))", "Bu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,A,B,C))", "Bdu"); - ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(1))", "Bdu"); + ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(1))", "Bdu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)))", "B"); ms_test("or_d(c:pk_h(A),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(B)))", "Bdue"); ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C))", "Bdue"); @@ -8478,7 +8478,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)))", "Bdu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(after(500000001),a:multi(2,A,B,C)))", "Bu"); ms_test("and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "nBu"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sdv:after(1))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sndv:after(1))", "Bdue"); ms_test("or_d(jc:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),multi(2,D,E,F)))", "Bdue"); ms_test("or_i(andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),after(1)),0)", "Bd"); @@ -8588,7 +8588,7 @@ mod tests { ms_test("andor(jc:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1))", "Bf"); ms_test("or_d(or_d(multi(2,A,B,C),j:multi(2,D,E,F)),after(1))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("andor(dv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001))", "B"); + ms_test("andor(ndv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001))", "B"); ms_test("and_v(v:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(A)),after(500000001))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("andor(jc:pk_k(A),multi(2,B,C,D),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); @@ -8632,7 +8632,7 @@ mod tests { ms_test("or_d(c:pk_h(A),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),j:multi(2,A,B,C))", "Bd"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),n:after(500000001),c:pk_h(A))", "Bdue"); - ms_test("or_d(dv:after(500000001),after(1))", "oBf"); + ms_test("or_d(ndv:after(500000001),after(1))", "oBf"); ms_test("or_i(0,andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)))", "Bd"); ms_test("or_d(or_i(multi(2,A,B,C),0),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bd"); @@ -8672,7 +8672,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(or_d(c:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(and_b(multi(2,A,B,C),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); - ms_test("or_b(dv:after(1),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_b(ndv:after(1),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_d(or_i(0,multi(2,A,B,C)),multi(2,D,E,F))", "sdueB"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "B"); ms_test("andor(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bd"); @@ -8730,7 +8730,7 @@ mod tests { ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)))", "nBf"); ms_test("and_v(v:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "Bf"); ms_test("or_b(c:pk_k(A),aj:multi(2,B,C,D))", "sdueB"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),adv:after(1))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andv:after(1))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(c:pk_h(A),after(1)))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)))", "Bdu"); ms_test("or_d(or_i(c:pk_k(A),0),after(1))", "Bf"); @@ -8744,7 +8744,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C),0)", "Bdus"); ms_test("andor(j:multi(2,A,B,C),c:pk_k(D),after(500000001))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001))", "B"); - ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(500000001))", "Bdue"); + ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(500000001))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_b(multi(2,A,B,C),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0))", "Bdu"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(after(1),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bu"); @@ -8776,7 +8776,7 @@ mod tests { ms_test("andor(jc:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001))", "Bf"); ms_test("or_d(j:multi(2,A,B,C),j:multi(2,D,E,F))", "Bdus"); ms_test("or_d(multi(2,A,B,C),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)))", "Bdue"); - ms_test("or_d(dv:after(1),after(1))", "oBf"); + ms_test("or_d(ndv:after(1),after(1))", "oBf"); ms_test("andor(or_i(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001))", "B"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,A,B,C)))", "Bdue"); ms_test("or_d(and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); @@ -8805,7 +8805,7 @@ mod tests { ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdue"); ms_test("or_b(or_i(0,after(500000001)),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(c:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); - ms_test("or_b(dv:after(1),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); + ms_test("or_b(ndv:after(1),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdue"); ms_test("andor(j:multi(2,A,B,C),multi(2,D,E,F),multi(2,G,I,J))", "sdueB"); ms_test("n:andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1),j:multi(2,A,B,C))", "Bdu"); ms_test("or_d(jc:pk_h(A),c:pk_k(B))", "sdueB"); @@ -8833,7 +8833,7 @@ mod tests { ms_test("or_d(jc:pk_k(A),after(500000001))", "oBf"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1),after(500000001))", "oBf"); - ms_test("or_d(dv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("or_d(ndv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(or_b(multi(2,A,B,C),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf"); ms_test("or_d(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("andor(multi(2,A,B,C),after(500000001),or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)))", "Bf"); @@ -8907,7 +8907,7 @@ mod tests { ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),and_b(and_b(after(500000001),a:after(500000001)),a:after(500000001)))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,A,B,C),after(1))", "B"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdu"); - ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),dv:after(500000001))", "Bdu"); + ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ndv:after(500000001))", "Bdu"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_k(A),c:pk_h(B))", "Bdus"); ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:after(500000001)))", "Bu"); ms_test("and_v(v:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)),after(1))", "Bf"); @@ -8932,7 +8932,7 @@ mod tests { ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)))", "Bdue"); ms_test("or_d(or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "Bf"); ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(after(1),a:after(1)),and_b(after(500000001),a:after(500000001)))", "Bfu"); - ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sdv:after(500000001))", "Bdue"); + ms_test("or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sndv:after(500000001))", "Bdue"); ms_test("thresh(2,j:multi(2,A,B,C),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_b(multi(2,A,B,C),ajc:pk_h(D))", "sdueB"); ms_test("thresh(2,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,A,B,C),a:multi(2,D,E,F))", "Bdus"); @@ -9023,7 +9023,7 @@ mod tests { ms_test("or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_v(v:after(1),1))", "oBfu"); ms_test("or_d(and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C))", "Bdue"); ms_test("or_d(multi(2,A,B,C),andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001),after(500000001)))", "Bf"); - ms_test("andor(dv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); + ms_test("andor(ndv:after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("or_d(jc:pk_h(A),after(1))", "Bf"); ms_test("andor(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bdu"); ms_test("and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)))", "nBu"); @@ -9162,7 +9162,7 @@ mod tests { ms_test("andor(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),multi(2,D,E,F),multi(2,G,I,J))", "Bdusem"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_b(multi(2,D,E,F),a:multi(2,G,I,J)))", "Bdusem"); ms_test("andor(and_b(multi(2,A,B,C),a:multi(2,D,E,F)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,G,I,J))", "Bdusem"); - ms_test("and_b(dvn:after(500000001),a:multi(2,A,B,C))", "Bndusm"); + ms_test("and_b(ndvn:after(500000001),a:multi(2,A,B,C))", "Bndusm"); ms_test("or_d(andor(multi(2,A,B,C),multi(2,D,E,F),0),multi(2,G,I,J))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),and_b(multi(2,D,E,F),a:multi(2,G,I,J)))", "Bdusem"); ms_test("and_b(multi(2,A,B,C),a:or_i(after(500000001),0))", "Bndusm"); @@ -9170,7 +9170,7 @@ mod tests { ms_test("and_b(multi(2,A,B,C),sjc:pk_k(D))", "Bndusm"); ms_test("andor(multi(2,A,B,C),after(500000001),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bsdem"); ms_test("andor(c:pk_k(A),or_i(multi(2,B,C,D),0),0)", "Bdusem"); - ms_test("andor(dvn:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndvn:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("andor(c:pk_k(A),after(500000001),c:pk_k(B))", "Bsdem"); ms_test("and_b(and_v(v:multi(2,A,B,C),multi(2,D,E,F)),a:multi(2,G,I,J))", "Bfnusm"); ms_test("and_b(multi(2,A,B,C),a:or_d(multi(2,D,E,F),or_i(after(500000001),0)))", "Bndusm"); @@ -9245,7 +9245,7 @@ mod tests { ms_test("or_i(0,or_i(0,multi(2,A,B,C)))", "Bsdum"); ms_test("andor(multi(2,A,B,C),n:or_d(multi(2,D,E,F),after(500000001)),multi(2,G,I,J))", "Bdusem"); ms_test("and_b(after(500000001),a:or_d(multi(2,A,B,C),c:pk_k(D)))", "Bsum"); - ms_test("and_v(vc:pk_h(A),dv:after(1))", "Bfnusm"); + ms_test("and_v(vc:pk_h(A),ndv:after(1))", "Bfnusm"); ms_test("and_b(multi(2,A,B,C),a:andor(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)))", "Bsnum"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),andor(multi(2,G,I,J),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,K,L,M)))", "Bdusem"); ms_test("and_v(vc:pk_h(A),j:multi(2,B,C,D))", "Bfnusm"); @@ -9308,7 +9308,7 @@ mod tests { ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),or_d(multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); ms_test("andor(multi(2,A,B,C),and_b(after(1),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),0)", "Bdusem"); ms_test("jj:and_v(v:multi(2,A,B,C),or_i(multi(2,D,E,F),0))", "Bndusm"); - ms_test("andor(dv:after(500000001),multi(2,A,B,C),0)", "Bsdum"); + ms_test("andor(ndv:after(500000001),multi(2,A,B,C),0)", "Bsdum"); ms_test("or_b(andor(multi(2,A,B,C),after(1),multi(2,D,E,F)),a:multi(2,G,I,J))", "Bdusem"); ms_test("andor(multi(2,A,B,C),or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),c:pk_h(D))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),j:and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)))", "Bsdum"); @@ -9352,7 +9352,7 @@ mod tests { ms_test("and_b(or_i(0,c:pk_h(A)),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsdum"); ms_test("and_v(or_c(multi(2,A,B,C),v:or_d(multi(2,D,E,F),j:multi(2,G,I,J))),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsfum"); ms_test("and_v(v:and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),ac:pk_k(A)),c:pk_k(B))", "Bfnusm"); - ms_test("andor(dv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("or_d(or_d(multi(2,A,B,C),andor(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0)),multi(2,G,I,J))", "Bdusem"); ms_test("andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),after(500000001),0)", "Bsdem"); ms_test("or_i(0,or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J))))", "Bsdum"); @@ -9490,7 +9490,7 @@ mod tests { ms_test("or_d(andor(c:pk_h(A),multi(2,B,C,D),or_d(multi(2,E,F,G),multi(2,I,J,K))),multi(2,L,M,N))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),and_b(multi(2,D,E,F),a:or_i(0,after(500000001))))", "Bsdum"); ms_test("andor(multi(2,A,B,C),or_i(n:after(500000001),0),multi(2,D,E,F))", "Bdusem"); - ms_test("thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),adv:after(1))", "Bsdum"); + ms_test("thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),andv:after(1))", "Bsdum"); ms_test("or_d(or_d(c:pk_h(A),c:pk_k(B)),multi(2,C,D,E))", "Bdusem"); ms_test("or_b(c:pk_k(A),ac:pk_h(B))", "Bdusem"); ms_test("n:andor(c:pk_k(A),after(500000001),multi(2,B,C,D))", "Bdusem"); @@ -9534,7 +9534,7 @@ mod tests { ms_test("c:and_v(or_c(multi(2,A,B,C),v:after(1)),pk_k(D))", "Bsum"); ms_test("and_v(v:or_d(multi(2,A,B,C),multi(2,D,E,F)),c:pk_h(G))", "Bsfum"); ms_test("and_b(after(500000001),a:and_v(v:after(500000001),multi(2,A,B,C)))", "Bsum"); - ms_test("and_v(v:multi(2,A,B,C),dv:after(1))", "Bfnusm"); + ms_test("and_v(v:multi(2,A,B,C),ndv:after(1))", "Bfnusm"); ms_test("andor(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F))", "Bdusem"); ms_test("and_b(multi(2,A,B,C),a:andor(multi(2,D,E,F),j:multi(2,G,I,J),after(500000001)))", "Bsnum"); ms_test("c:and_v(or_c(multi(2,A,B,C),v:multi(2,D,E,F)),pk_k(G))", "Bsfum"); @@ -9584,8 +9584,8 @@ mod tests { ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)))", "Bsum"); ms_test("andor(or_b(multi(2,A,B,C),a:multi(2,D,E,F)),n:after(1),multi(2,G,I,J))", "Bdusem"); ms_test("andor(multi(2,A,B,C),after(500000001),or_d(multi(2,D,E,F),c:pk_k(G)))", "Bsdem"); - ms_test("andor(dv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); - ms_test("and_b(dv:after(1),ac:pk_h(A))", "Bndusm"); + ms_test("andor(ndv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("and_b(ndv:after(1),ac:pk_h(A))", "Bndusm"); ms_test("or_d(multi(2,A,B,C),or_d(or_d(multi(2,D,E,F),multi(2,G,I,J)),multi(2,K,L,M)))", "Bdusem"); ms_test("andor(multi(2,A,B,C),or_i(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),multi(2,D,E,F))", "Bdusem"); ms_test("j:and_b(multi(2,A,B,C),a:or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bndusm"); @@ -9599,7 +9599,7 @@ mod tests { ms_test("andor(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),multi(2,G,I,J),multi(2,K,L,M))", "Bdusem"); ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),or_d(multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); ms_test("and_v(v:andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),multi(2,G,I,J))", "Bsfum"); - ms_test("and_b(dv:after(1),a:multi(2,A,B,C))", "Bndusm"); + ms_test("and_b(ndv:after(1),a:multi(2,A,B,C))", "Bndusm"); ms_test("j:and_v(v:multi(2,A,B,C),or_i(after(500000001),0))", "Bndsem"); ms_test("and_b(c:pk_k(A),a:and_b(after(1),a:and_b(after(1),ac:pk_k(B))))", "Bsnum"); ms_test("andor(multi(2,A,B,C),after(1),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bsdem"); @@ -9686,14 +9686,14 @@ mod tests { ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),and_b(multi(2,G,I,J),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsdum"); ms_test("and_b(and_v(v:after(500000001),after(500000001)),ac:pk_h(A))", "Bsum"); ms_test("and_v(v:multi(2,A,B,C),and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)))", "Bsnfm"); - ms_test("and_b(or_i(0,dv:after(500000001)),a:multi(2,A,B,C))", "Bsdum"); + ms_test("and_b(or_i(0,ndv:after(500000001)),a:multi(2,A,B,C))", "Bsdum"); ms_test("and_b(multi(2,A,B,C),a:and_b(after(500000001),aj:multi(2,D,E,F)))", "Bsnum"); ms_test("andor(c:pk_k(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(B))", "Bdusem"); ms_test("andor(or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J)),multi(2,K,L,M),multi(2,N,O,P))", "Bdusem"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,G,I,J))", "Bsdem"); ms_test("or_d(c:pk_h(A),or_d(multi(2,B,C,D),multi(2,E,F,G)))", "Bdusem"); ms_test("jc:and_v(v:multi(2,A,B,C),pk_h(D))", "Bndusem"); - ms_test("and_b(dv:after(500000001),ac:pk_k(A))", "Bndusm"); + ms_test("and_b(ndv:after(500000001),ac:pk_k(A))", "Bndusm"); ms_test("or_d(multi(2,A,B,C),or_d(c:pk_h(D),j:multi(2,E,F,G)))", "Bsdum"); ms_test("and_v(v:or_i(after(1),0),multi(2,A,B,C))", "Bsum"); ms_test("c:andor(c:pk_h(A),pk_h(B),pk_k(C))", "Bdusem"); @@ -9754,7 +9754,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),andor(multi(2,G,I,J),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,K,L,M)))", "Bdusem"); ms_test("and_b(multi(2,A,B,C),s:or_d(c:pk_k(D),after(500000001)))", "Bsnum"); ms_test("and_b(thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),a:multi(2,G,I,J)),a:after(1))", "Bsum"); - ms_test("andor(multi(2,A,B,C),dv:after(1),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndv:after(1),multi(2,D,E,F))", "Bdusem"); ms_test("or_i(0,and_v(v:multi(2,A,B,C),multi(2,D,E,F)))", "Bdusem"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),j:multi(2,G,I,J))", "Bsdum"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(500000001),0),0)", "Bsdem"); @@ -9764,7 +9764,7 @@ mod tests { ms_test("or_d(or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J))),or_d(multi(2,K,L,M),multi(2,N,O,P)))", "Bdusem"); ms_test("j:and_b(j:multi(2,A,B,C),an:after(1))", "Bndusm"); ms_test("or_b(andor(multi(2,A,B,C),after(1),multi(2,D,E,F)),a:multi(2,G,I,J))", "Bdusem"); - ms_test("andor(dv:after(500000001),or_b(multi(2,A,B,C),a:multi(2,D,E,F)),multi(2,G,I,J))", "Bsdum"); + ms_test("andor(ndv:after(500000001),or_b(multi(2,A,B,C),a:multi(2,D,E,F)),multi(2,G,I,J))", "Bsdum"); ms_test("and_b(multi(2,A,B,C),a:andor(multi(2,D,E,F),after(1),after(1)))", "Bsnum"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_b(multi(2,G,I,J),a:or_d(multi(2,K,L,M),multi(2,N,O,P))))", "Bdusem"); ms_test("c:and_v(v:or_d(multi(2,A,B,C),after(1)),pk_k(D))", "Bsum"); @@ -9801,7 +9801,7 @@ mod tests { ms_test("or_d(multi(2,A,B,C),or_i(jc:pk_h(D),0))", "Bsdum"); ms_test("or_d(c:andor(multi(2,A,B,C),pk_h(D),pk_k(E)),multi(2,F,G,I))", "Bdusem"); ms_test("or_i(0,andor(multi(2,A,B,C),n:after(500000001),c:pk_h(D)))", "Bsdum"); - ms_test("c:andor(dv:after(500000001),pk_k(A),pk_k(B))", "Bsdum"); + ms_test("c:andor(ndv:after(500000001),pk_k(A),pk_k(B))", "Bsdum"); ms_test("or_d(andor(multi(2,A,B,C),n:after(500000001),multi(2,D,E,F)),c:pk_h(G))", "Bdusem"); ms_test("or_d(or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J))),multi(2,K,L,M))", "Bdusem"); ms_test("andor(andor(multi(2,A,B,C),multi(2,D,E,F),0),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,G,I,J))", "Bdusem"); @@ -9876,7 +9876,7 @@ mod tests { ms_test("or_d(multi(2,A,B,C),or_b(multi(2,D,E,F),sc:pk_k(G)))", "Bdusem"); ms_test("and_v(v:or_d(c:pk_k(A),multi(2,B,C,D)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsfum"); ms_test("and_v(vj:multi(2,A,B,C),after(1))", "Bsnfm"); - ms_test("c:andor(dv:after(500000001),pk_h(A),pk_k(B))", "Bsdum"); + ms_test("c:andor(ndv:after(500000001),pk_h(A),pk_k(B))", "Bsdum"); ms_test("and_v(v:andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsfum"); ms_test("or_d(multi(2,A,B,C),or_i(0,jc:pk_h(D)))", "Bsdum"); ms_test("thresh(2,multi(2,A,B,C),ac:pk_h(D),a:multi(2,E,F,G))", "Bdusem"); @@ -9957,7 +9957,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(1),after(1)),0)", "Bsdem"); ms_test("andor(c:pk_h(A),after(500000001),c:pk_h(B))", "Bsdem"); ms_test("or_d(or_d(c:pk_h(A),multi(2,B,C,D)),or_d(multi(2,E,F,G),multi(2,I,J,K)))", "Bdusem"); - ms_test("c:andor(dv:after(500000001),pk_h(A),pk_k(B))", "Bsdum"); + ms_test("c:andor(ndv:after(500000001),pk_h(A),pk_k(B))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),c:andor(multi(2,D,E,F),pk_k(G),pk_k(I)))", "Bdusem"); ms_test("andor(multi(2,A,B,C),after(1),j:multi(2,D,E,F))", "Bsdm"); ms_test("or_i(or_b(multi(2,A,B,C),a:multi(2,D,E,F)),0)", "Bsdum"); @@ -9989,7 +9989,7 @@ mod tests { ms_test("or_i(0,or_d(multi(2,A,B,C),or_i(0,multi(2,D,E,F))))", "Bsdum"); ms_test("and_v(or_c(c:pk_k(A),vc:and_v(v:or_d(c:pk_h(B),c:pk_h(C)),pk_k(D))),after(500000001))", "Bsfm"); ms_test("and_v(v:and_v(v:multi(2,A,B,C),after(500000001)),1)", "Bfnusm"); - ms_test("andor(multi(2,A,B,C),or_i(0,dv:after(1)),0)", "Bdusem"); + ms_test("andor(multi(2,A,B,C),or_i(0,ndv:after(1)),0)", "Bdusem"); ms_test("andor(c:pk_h(A),jc:pk_h(B),c:pk_h(C))", "Bdusem"); ms_test("andor(multi(2,A,B,C),after(500000001),and_b(after(500000001),a:multi(2,D,E,F)))", "Bsm"); ms_test("or_d(multi(2,A,B,C),and_v(v:multi(2,D,E,F),after(1)))", "Bsfm"); @@ -10260,7 +10260,7 @@ mod tests { ms_test("or_i(0,or_i(0,j:multi(2,A,B,C)))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),andor(c:pk_h(D),after(1),multi(2,E,F,G)))", "Bsdem"); ms_test("and_v(v:andor(c:pk_h(A),after(500000001),after(500000001)),multi(2,B,C,D))", "Bsum"); - ms_test("and_b(multi(2,A,B,C),sdv:after(500000001))", "Bndusm"); + ms_test("and_b(multi(2,A,B,C),sndv:after(500000001))", "Bndusm"); ms_test("or_d(andor(multi(2,A,B,C),multi(2,D,E,F),multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),and_b(multi(2,D,E,F),an:after(500000001)))", "Bsum"); ms_test("andor(c:pk_k(A),c:pk_h(B),c:pk_k(C))", "Bdusem"); @@ -10339,7 +10339,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),j:multi(2,D,E,F),or_d(multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),j:multi(2,G,I,J))", "Bsdum"); ms_test("or_d(thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),a:multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); - ms_test("thresh(2,or_d(multi(2,A,B,C),multi(2,D,E,F)),a:multi(2,G,I,J),sdv:after(500000001))", "Bsdum"); + ms_test("thresh(2,or_d(multi(2,A,B,C),multi(2,D,E,F)),a:multi(2,G,I,J),sndv:after(500000001))", "Bsdum"); ms_test("or_i(0,and_b(c:pk_h(A),a:after(1)))", "Bsdum"); ms_test("and_b(and_b(multi(2,A,B,C),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bndusm"); ms_test("j:and_v(v:multi(2,A,B,C),or_d(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bndusem"); @@ -10444,7 +10444,7 @@ mod tests { ms_test("or_d(andor(multi(2,A,B,C),multi(2,D,E,F),multi(2,G,I,J)),or_i(multi(2,K,L,M),0))", "Bsdum"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),jc:pk_k(G))", "Bsdum"); ms_test("andor(multi(2,A,B,C),after(1),jc:and_v(v:after(1),pk_h(D)))", "Bsdm"); - ms_test("andor(dv:after(500000001),c:pk_k(A),multi(2,B,C,D))", "Bsdum"); + ms_test("andor(ndv:after(500000001),c:pk_k(A),multi(2,B,C,D))", "Bsdum"); ms_test("andor(c:pk_k(A),c:pk_h(B),0)", "Bdusem"); ms_test("andor(multi(2,A,B,C),and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)),multi(2,D,E,F))", "Bsdem"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(multi(2,D,E,F),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsdum"); @@ -10519,7 +10519,7 @@ mod tests { ms_test("andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),c:pk_k(G),multi(2,I,J,K))", "Bdusem"); ms_test("and_b(c:pk_k(A),s:and_v(vc:pk_k(B),after(1)))", "Bfnusm"); ms_test("or_d(c:pk_k(A),or_d(multi(2,B,C,D),multi(2,E,F,G)))", "Bdusem"); - ms_test("andor(c:pk_h(A),dv:after(1),multi(2,B,C,D))", "Bdusem"); + ms_test("andor(c:pk_h(A),ndv:after(1),multi(2,B,C,D))", "Bdusem"); ms_test("or_d(c:andor(multi(2,A,B,C),pk_h(D),pk_k(E)),multi(2,F,G,I))", "Bdusem"); ms_test("c:andor(or_b(multi(2,A,B,C),a:multi(2,D,E,F)),pk_h(G),pk_k(I))", "Bdusem"); ms_test("or_b(multi(2,A,B,C),aj:and_v(v:multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bdusem"); @@ -10598,7 +10598,7 @@ mod tests { ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),jc:pk_k(G))", "Bsdum"); ms_test("and_b(after(500000001),a:andor(multi(2,A,B,C),after(500000001),multi(2,D,E,F)))", "Bsum"); ms_test("and_b(and_b(multi(2,A,B,C),a:multi(2,D,E,F)),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bndusm"); - ms_test("andor(dv:after(500000001),multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bsdum"); + ms_test("andor(ndv:after(500000001),multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bsdum"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_v(or_c(multi(2,D,E,F),v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,G,I,J)))", "Bsum"); ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,A,B,C)))", "Bsnum"); ms_test("andor(c:pk_h(A),multi(2,B,C,D),j:multi(2,E,F,G))", "Bsdum"); @@ -10674,7 +10674,7 @@ mod tests { ms_test("and_v(v:or_i(after(500000001),0),j:multi(2,A,B,C))", "Bsum"); ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)))", "Bsnum"); ms_test("or_d(multi(2,A,B,C),or_i(0,or_d(multi(2,D,E,F),multi(2,G,I,J))))", "Bsdum"); - ms_test("andor(multi(2,A,B,C),dv:after(500000001),c:pk_k(D))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndv:after(500000001),c:pk_k(D))", "Bdusem"); ms_test("or_b(c:pk_k(A),sc:pk_k(B))", "Bdusem"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0))", "Bdusem"); ms_test("or_i(0,multi(2,A,B,C))", "Bsdum"); @@ -10779,7 +10779,7 @@ mod tests { ms_test("andor(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),multi(2,G,I,J),0)", "Bdusem"); ms_test("and_b(c:pk_h(A),ac:pk_h(B))", "Bndusem"); ms_test("andor(multi(2,A,B,C),and_v(v:multi(2,D,E,F),multi(2,G,I,J)),0)", "Bdusem"); - ms_test("andor(multi(2,A,B,C),jdv:after(1),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),njdv:after(1),multi(2,D,E,F))", "Bdusem"); ms_test("and_b(or_b(multi(2,A,B,C),a:multi(2,D,E,F)),a:after(500000001))", "Bsum"); ms_test("or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),or_i(0,multi(2,G,I,J))))", "Bsdum"); ms_test("or_d(or_d(c:pk_k(A),multi(2,B,C,D)),j:multi(2,E,F,G))", "Bsdum"); @@ -10881,7 +10881,7 @@ mod tests { ms_test("or_i(andor(c:pk_h(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(after(1),ac:pk_k(B))),0)", "Bsdum"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,D,E,F))", "Bsdum"); ms_test("andor(multi(2,A,B,C),after(500000001),or_i(multi(2,D,E,F),0))", "Bsdm"); - ms_test("andor(dv:after(1),multi(2,A,B,C),c:pk_h(D))", "Bsdum"); + ms_test("andor(ndv:after(1),multi(2,A,B,C),c:pk_h(D))", "Bsdum"); ms_test("and_b(c:pk_h(A),a:and_v(v:after(500000001),after(500000001)))", "Bsnum"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),after(1)),multi(2,G,I,J))", "Bsdem"); ms_test("andor(multi(2,A,B,C),and_v(v:after(1),multi(2,D,E,F)),multi(2,G,I,J))", "Bdusem"); @@ -10922,7 +10922,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),n:after(500000001),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bdusem"); ms_test("c:andor(c:pk_k(A),pk_k(B),pk_k(C))", "Bdusem"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_i(j:multi(2,G,I,J),0))", "Bsdum"); - ms_test("andor(multi(2,A,B,C),dv:after(500000001),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndv:after(500000001),multi(2,D,E,F))", "Bdusem"); ms_test("andor(andor(multi(2,A,B,C),multi(2,D,E,F),multi(2,G,I,J)),after(500000001),multi(2,K,L,M))", "Bsdem"); ms_test("or_d(c:pk_h(A),and_v(v:multi(2,B,C,D),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsfum"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),multi(2,G,I,J),after(1)),multi(2,K,L,M))", "Bsdem"); @@ -10956,14 +10956,14 @@ mod tests { ms_test("or_d(or_d(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),multi(2,G,I,J)),j:multi(2,K,L,M))", "Bsdum"); ms_test("andor(multi(2,A,B,C),jc:pk_k(D),multi(2,E,F,G))", "Bdusem"); ms_test("or_d(or_d(c:pk_h(A),multi(2,B,C,D)),c:pk_h(E))", "Bdusem"); - ms_test("andor(multi(2,A,B,C),dv:after(1),j:multi(2,D,E,F))", "Bsdum"); + ms_test("andor(multi(2,A,B,C),ndv:after(1),j:multi(2,D,E,F))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),c:pk_k(G)))", "Bdusem"); ms_test("and_b(multi(2,A,B,C),a:and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:after(500000001)))", "Bsnum"); ms_test("or_i(andor(multi(2,A,B,C),after(500000001),multi(2,D,E,F)),0)", "Bsdm"); ms_test("or_d(c:pk_h(A),or_b(multi(2,B,C,D),a:multi(2,E,F,G)))", "Bdusem"); ms_test("and_b(and_v(v:multi(2,A,B,C),multi(2,D,E,F)),a:after(1))", "Bfnusm"); ms_test("or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),or_i(0,multi(2,G,I,J))))", "Bsdum"); - ms_test("andor(multi(2,A,B,C),dvn:after(1),j:multi(2,D,E,F))", "Bsdum"); + ms_test("andor(multi(2,A,B,C),ndvn:after(1),j:multi(2,D,E,F))", "Bsdum"); ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),or_i(0,multi(2,G,I,J)))", "Bsdum"); ms_test("andor(multi(2,A,B,C),and_b(multi(2,D,E,F),a:after(500000001)),multi(2,G,I,J))", "Bdusem"); ms_test("andor(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),c:pk_h(G),multi(2,I,J,K))", "Bdusem"); @@ -11017,7 +11017,7 @@ mod tests { ms_test("and_b(n:after(500000001),sc:pk_k(A))", "Bsum"); ms_test("or_i(and_v(v:multi(2,A,B,C),n:after(1)),0)", "Bdusem"); ms_test("and_v(v:multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bfnusm"); - ms_test("c:andor(dv:after(500000001),pk_k(A),pk_k(B))", "Bsdum"); + ms_test("c:andor(ndv:after(500000001),pk_k(A),pk_k(B))", "Bsdum"); ms_test("andor(multi(2,A,B,C),after(1),and_v(v:multi(2,D,E,F),after(1)))", "Bsfm"); ms_test("and_b(andor(multi(2,A,B,C),after(500000001),0),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),and_b(c:pk_h(D),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsdum"); @@ -11031,7 +11031,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bdusem"); ms_test("andor(multi(2,A,B,C),after(1),or_d(multi(2,D,E,F),j:multi(2,G,I,J)))", "Bsdm"); ms_test("and_b(multi(2,A,B,C),an:or_d(multi(2,D,E,F),after(500000001)))", "Bsnum"); - ms_test("andor(multi(2,A,B,C),dv:after(1),j:multi(2,D,E,F))", "Bsdum"); + ms_test("andor(multi(2,A,B,C),ndv:after(1),j:multi(2,D,E,F))", "Bsdum"); ms_test("and_v(v:multi(2,A,B,C),or_d(multi(2,D,E,F),n:after(1)))", "Bfnusm"); ms_test("or_d(or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); ms_test("andor(multi(2,A,B,C),or_i(j:multi(2,D,E,F),0),multi(2,G,I,J))", "Bdusem"); @@ -11052,10 +11052,10 @@ mod tests { ms_test("c:pk_k(A)", "Bndousem"); ms_test("andor(multi(2,A,B,C),and_b(after(500000001),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),c:pk_h(D))", "Bdusem"); ms_test("or_b(c:pk_h(A),a:or_b(multi(2,B,C,D),ac:pk_h(E)))", "Bdusem"); - ms_test("and_b(dv:after(500000001),aj:multi(2,A,B,C))", "Bndusm"); + ms_test("and_b(ndv:after(500000001),aj:multi(2,A,B,C))", "Bndusm"); ms_test("and_b(after(500000001),a:and_v(v:multi(2,A,B,C),multi(2,D,E,F)))", "Bsfum"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bdusem"); - ms_test("andor(dv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("andor(multi(2,A,B,C),after(1),jc:pk_k(D))", "Bsdm"); ms_test("or_d(andor(multi(2,A,B,C),multi(2,D,E,F),multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),c:andor(multi(2,D,E,F),pk_h(G),pk_k(I)))", "Bdusem"); @@ -11074,7 +11074,7 @@ mod tests { ms_test("jj:and_v(vj:multi(2,A,B,C),after(500000001))", "Bsndm"); ms_test("andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,G,I,J))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),andor(multi(2,D,E,F),n:after(500000001),multi(2,G,I,J)))", "Bdusem"); - ms_test("andor(dv:after(500000001),multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bsdum"); + ms_test("andor(ndv:after(500000001),multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bsdum"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,G,I,J)))", "Bdusem"); ms_test("and_v(v:or_b(multi(2,A,B,C),a:multi(2,D,E,F)),multi(2,G,I,J))", "Bsfum"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,G,I,J)))", "Bsum"); @@ -11203,7 +11203,7 @@ mod tests { ms_test("and_v(or_c(multi(2,A,B,C),vj:multi(2,D,E,F)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsfum"); ms_test("or_d(c:pk_k(A),and_b(after(1),a:multi(2,B,C,D)))", "Bsum"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),c:pk_k(G))", "Bdusem"); - ms_test("and_b(dvn:after(500000001),a:or_b(multi(2,A,B,C),a:multi(2,D,E,F)))", "Bndusm"); + ms_test("and_b(ndvn:after(500000001),a:or_b(multi(2,A,B,C),a:multi(2,D,E,F)))", "Bndusm"); ms_test("n:andor(c:pk_h(A),after(500000001),multi(2,B,C,D))", "Bdusem"); ms_test("and_v(v:andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(500000001)),multi(2,D,E,F))", "Bsum"); ms_test("n:or_i(0,andor(multi(2,A,B,C),after(500000001),multi(2,D,E,F)))", "Bsdum"); @@ -11236,7 +11236,7 @@ mod tests { ms_test("and_v(v:and_v(v:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bsnfm"); ms_test("or_d(multi(2,A,B,C),and_v(v:multi(2,D,E,F),1))", "Bsfum"); ms_test("or_i(and_v(v:after(1),c:pk_h(A)),0)", "Bsdum"); - ms_test("and_b(c:pk_h(A),sdv:after(1))", "Bndusm"); + ms_test("and_b(c:pk_h(A),sndv:after(1))", "Bndusm"); ms_test("and_v(vc:pk_h(A),multi(2,B,C,D))", "Bfnusm"); ms_test("or_b(thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),a:multi(2,G,I,J)),a:multi(2,K,L,M))", "Bdusem"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),after(500000001)),multi(2,G,I,J))", "Bsdem"); @@ -11252,7 +11252,7 @@ mod tests { ms_test("or_d(c:pk_k(A),jc:pk_h(B))", "Bsdum"); ms_test("andor(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0)", "Bdusem"); ms_test("or_b(or_d(multi(2,A,B,C),multi(2,D,E,F)),ac:pk_k(G))", "Bdusem"); - ms_test("andor(multi(2,A,B,C),jdv:after(1),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),njdv:after(1),multi(2,D,E,F))", "Bdusem"); ms_test("or_d(c:pk_h(A),jc:pk_h(B))", "Bsdum"); ms_test("andor(multi(2,A,B,C),or_i(after(500000001),0),j:multi(2,D,E,F))", "Bsdm"); ms_test("andor(multi(2,A,B,C),n:after(1),c:pk_k(D))", "Bdusem"); @@ -11277,7 +11277,7 @@ mod tests { ms_test("andor(c:pk_k(A),n:after(1),multi(2,B,C,D))", "Bdusem"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(multi(2,D,E,F),multi(2,G,I,J),0))", "Bdusem"); ms_test("and_b(and_v(v:after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),ac:pk_h(A))", "Bsnum"); - ms_test("c:andor(dv:after(1),pk_h(A),pk_h(B))", "Bsdum"); + ms_test("c:andor(ndv:after(1),pk_h(A),pk_h(B))", "Bsdum"); ms_test("or_b(or_d(multi(2,A,B,C),multi(2,D,E,F)),a:multi(2,G,I,J))", "Bdusem"); ms_test("j:and_v(vc:pk_k(A),multi(2,B,C,D))", "Bndusem"); ms_test("or_d(multi(2,A,B,C),or_i(0,c:pk_k(D)))", "Bsdum"); @@ -11296,7 +11296,7 @@ mod tests { ms_test("and_b(after(1),a:multi(2,A,B,C))", "Bsum"); ms_test("andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),after(1),multi(2,G,I,J))", "Bsdem"); ms_test("or_i(0,and_v(v:after(1),multi(2,A,B,C)))", "Bsdum"); - ms_test("andor(c:pk_h(A),dv:after(500000001),multi(2,B,C,D))", "Bdusem"); + ms_test("andor(c:pk_h(A),ndv:after(500000001),multi(2,B,C,D))", "Bdusem"); ms_test("and_b(after(500000001),a:and_b(multi(2,A,B,C),a:multi(2,D,E,F)))", "Bsum"); ms_test("or_d(c:pk_h(A),jc:pk_h(B))", "Bsdum"); ms_test("and_v(v:and_v(v:after(1),after(1)),multi(2,A,B,C))", "Bsnum"); @@ -11455,7 +11455,7 @@ mod tests { ms_test("c:and_v(v:multi(2,A,B,C),pk_k(D))", "Bfnusm"); ms_test("or_d(or_d(or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J))),c:pk_k(K)),multi(2,L,M,N))", "Bdusem"); ms_test("andor(or_d(multi(2,A,B,C),c:pk_k(D)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,E,F,G))", "Bdusem"); - ms_test("andor(dv:after(1),multi(2,A,B,C),0)", "Bsdum"); + ms_test("andor(ndv:after(1),multi(2,A,B,C),0)", "Bsdum"); ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),or_d(c:pk_h(G),j:multi(2,I,J,K)))", "Bsdum"); ms_test("andor(multi(2,A,B,C),j:and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),c:pk_h(D))", "Bdusem"); ms_test("and_b(j:multi(2,A,B,C),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bndusm"); @@ -11534,7 +11534,7 @@ mod tests { ms_test("or_d(multi(2,A,B,C),and_v(or_c(multi(2,D,E,F),v:multi(2,G,I,J)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsfum"); ms_test("jc:and_v(vn:after(1),pk_h(A))", "Bndusm"); ms_test("or_i(and_v(or_c(multi(2,A,B,C),v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F)),0)", "Bsdum"); - ms_test("andor(dv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,D,E,F)))", "Bsdum"); ms_test("and_b(c:pk_h(A),a:or_d(or_d(c:pk_k(B),multi(2,C,D,E)),after(1)))", "Bsnum"); ms_test("and_b(or_b(multi(2,A,B,C),ac:pk_h(D)),a:after(500000001))", "Bsum"); @@ -11570,7 +11570,7 @@ mod tests { ms_test("or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),c:pk_k(G)))", "Bdusem"); ms_test("n:andor(c:pk_h(A),after(1),multi(2,B,C,D))", "Bdusem"); ms_test("and_b(after(1),a:and_b(after(1),ac:pk_h(A)))", "Bsum"); - ms_test("and_b(dv:after(500000001),a:multi(2,A,B,C))", "Bndusm"); + ms_test("and_b(ndv:after(500000001),a:multi(2,A,B,C))", "Bndusm"); ms_test("andor(c:pk_k(A),multi(2,B,C,D),multi(2,E,F,G))", "Bdusem"); ms_test("or_d(c:pk_h(A),andor(multi(2,B,C,D),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,E,F,G)))", "Bdusem"); ms_test("andor(multi(2,A,B,C),or_b(multi(2,D,E,F),a:multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); @@ -11583,7 +11583,7 @@ mod tests { ms_test("and_b(multi(2,A,B,C),a:and_b(after(500000001),a:multi(2,D,E,F)))", "Bsnum"); ms_test("and_b(after(500000001),a:and_b(after(500000001),a:multi(2,A,B,C)))", "Bsum"); ms_test("andor(multi(2,A,B,C),c:pk_k(D),j:multi(2,E,F,G))", "Bsdum"); - ms_test("j:and_v(v:multi(2,A,B,C),dv:after(1))", "Bndusem"); + ms_test("j:and_v(v:multi(2,A,B,C),ndv:after(1))", "Bndusem"); ms_test("and_v(v:andor(multi(2,A,B,C),and_b(after(1),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F))", "Bsum"); ms_test("andor(c:pk_h(A),or_d(multi(2,B,C,D),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,E,F,G))", "Bdusem"); ms_test("andor(c:pk_h(A),multi(2,B,C,D),jc:pk_h(E))", "Bsdum"); @@ -11621,7 +11621,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_d(multi(2,G,I,J),or_b(multi(2,K,L,M),a:multi(2,N,O,P))))", "Bdusem"); ms_test("or_d(c:pk_k(A),jc:pk_h(B))", "Bsdum"); ms_test("j:and_v(v:multi(2,A,B,C),j:multi(2,D,E,F))", "Bndusem"); - ms_test("andor(or_d(dv:after(500000001),multi(2,A,B,C)),multi(2,D,E,F),multi(2,G,I,J))", "Bsdum"); + ms_test("andor(or_d(ndv:after(500000001),multi(2,A,B,C)),multi(2,D,E,F),multi(2,G,I,J))", "Bsdum"); ms_test("and_v(v:and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C))", "Bsnum"); ms_test("and_v(or_c(multi(2,A,B,C),v:multi(2,D,E,F)),j:multi(2,G,I,J))", "Bsfum"); ms_test("n:andor(multi(2,A,B,C),after(500000001),j:multi(2,D,E,F))", "Bsdum"); @@ -11741,7 +11741,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),or_i(multi(2,D,E,F),0),multi(2,G,I,J))", "Bdusem"); ms_test("and_b(after(1),a:and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,A,B,C)))", "Bsum"); ms_test("andor(multi(2,A,B,C),and_v(v:after(500000001),after(500000001)),multi(2,D,E,F))", "Bsdem"); - ms_test("thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),adv:after(1))", "Bsdum"); + ms_test("thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),andv:after(1))", "Bsdum"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),j:multi(2,G,I,J)),j:multi(2,K,L,M))", "Bsdum"); ms_test("or_d(c:pk_h(A),and_b(after(1),ac:pk_k(B)))", "Bsum"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(1),after(1)),multi(2,G,I,J))", "Bsdem"); @@ -11759,7 +11759,7 @@ mod tests { ms_test("and_v(and_v(v:after(1),v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C))", "Bsnum"); ms_test("and_b(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),after(1)),a:multi(2,D,E,F))", "Bsum"); ms_test("and_b(after(500000001),a:and_b(multi(2,A,B,C),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsum"); - ms_test("andor(dv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("andor(multi(2,A,B,C),c:pk_k(D),j:multi(2,E,F,G))", "Bsdum"); ms_test("j:and_v(vc:pk_h(A),after(500000001))", "Bndsem"); ms_test("and_v(v:andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),multi(2,G,I,J))", "Bsfum"); @@ -11778,7 +11778,7 @@ mod tests { ms_test("thresh(2,multi(2,A,B,C),a:or_d(multi(2,D,E,F),multi(2,G,I,J)),a:multi(2,K,L,M))", "Bdusem"); ms_test("andor(multi(2,A,B,C),or_i(j:multi(2,D,E,F),0),multi(2,G,I,J))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),or_i(multi(2,D,E,F),0))", "Bsdum"); - ms_test("andor(dv:after(500000001),multi(2,A,B,C),c:pk_k(D))", "Bsdum"); + ms_test("andor(ndv:after(500000001),multi(2,A,B,C),c:pk_k(D))", "Bsdum"); ms_test("andor(c:pk_h(A),after(1),j:multi(2,B,C,D))", "Bsdm"); ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),or_d(multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); ms_test("and_v(v:after(500000001),and_b(after(500000001),ac:pk_h(A)))", "Bsum"); @@ -11840,7 +11840,7 @@ mod tests { ms_test("and_v(and_v(v:after(500000001),vc:pk_h(A)),after(500000001))", "Bsnfm"); ms_test("n:andor(multi(2,A,B,C),or_d(multi(2,D,E,F),after(500000001)),multi(2,G,I,J))", "Bdusem"); ms_test("or_d(and_b(multi(2,A,B,C),a:multi(2,D,E,F)),multi(2,G,I,J))", "Bdusem"); - ms_test("andor(dv:after(500000001),multi(2,A,B,C),c:pk_h(D))", "Bsdum"); + ms_test("andor(ndv:after(500000001),multi(2,A,B,C),c:pk_h(D))", "Bsdum"); ms_test("c:andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),pk_k(G),pk_k(I))", "Bdusem"); ms_test("and_b(or_i(0,n:after(500000001)),a:multi(2,A,B,C))", "Bsdum"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),andor(multi(2,G,I,J),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0))", "Bdusem"); @@ -11853,7 +11853,7 @@ mod tests { ms_test("and_b(or_d(c:pk_k(A),after(500000001)),a:multi(2,B,C,D))", "Bsum"); ms_test("and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:and_v(v:multi(2,A,B,C),c:pk_h(D)))", "Bfnusm"); ms_test("andor(c:pk_h(A),multi(2,B,C,D),multi(2,E,F,G))", "Bdusem"); - ms_test("andor(dv:after(1),multi(2,A,B,C),j:multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndv:after(1),multi(2,A,B,C),j:multi(2,D,E,F))", "Bsdum"); ms_test("n:and_v(vc:pk_k(A),after(500000001))", "Bfnousm"); ms_test("or_d(multi(2,A,B,C),or_d(or_d(multi(2,D,E,F),or_d(or_d(multi(2,G,I,J),multi(2,K,L,M)),multi(2,N,O,P))),multi(2,Q,R,S)))", "Bdusem"); ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(multi(2,A,B,C),a:after(1)))", "Bsnum"); @@ -11984,7 +11984,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),n:after(1),multi(2,D,E,F))", "Bdusem"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(c:pk_k(D),0))", "Bsdum"); ms_test("andor(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),after(500000001),multi(2,G,I,J))", "Bsdem"); - ms_test("andor(c:pk_h(A),dv:after(1),c:pk_k(B))", "Bdusem"); + ms_test("andor(c:pk_h(A),ndv:after(1),c:pk_k(B))", "Bdusem"); ms_test("and_b(or_i(0,multi(2,A,B,C)),a:and_v(v:after(1),after(1)))", "Bsum"); ms_test("and_b(after(1),a:or_b(multi(2,A,B,C),a:multi(2,D,E,F)))", "Bsum"); ms_test("or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),or_d(multi(2,G,I,J),multi(2,K,L,M))))", "Bdusem"); @@ -12105,7 +12105,7 @@ mod tests { ms_test("c:and_v(and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),pk_h(A))", "Bsnum"); ms_test("and_b(or_d(multi(2,A,B,C),multi(2,D,E,F)),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsdum"); ms_test("and_v(v:after(1),and_b(multi(2,A,B,C),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsnum"); - ms_test("andor(multi(2,A,B,C),dv:after(1),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndv:after(1),multi(2,D,E,F))", "Bdusem"); ms_test("and_v(v:or_b(multi(2,A,B,C),a:multi(2,D,E,F)),1)", "Bsfum"); ms_test("and_v(and_v(v:or_d(multi(2,A,B,C),after(1)),v:multi(2,D,E,F)),multi(2,G,I,J))", "Bsfum"); ms_test("and_v(v:after(1),and_v(v:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bfnusm"); @@ -12115,7 +12115,7 @@ mod tests { ms_test("and_b(c:pk_h(A),ac:pk_k(B))", "Bndusem"); ms_test("and_v(v:or_i(multi(2,A,B,C),0),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsfum"); ms_test("andor(c:pk_k(A),n:after(500000001),multi(2,B,C,D))", "Bdusem"); - ms_test("andor(multi(2,A,B,C),jdv:after(500000001),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),njdv:after(500000001),multi(2,D,E,F))", "Bdusem"); ms_test("andor(andor(multi(2,A,B,C),multi(2,D,E,F),multi(2,G,I,J)),multi(2,K,L,M),multi(2,N,O,P))", "Bdusem"); ms_test("or_d(or_d(multi(2,A,B,C),c:pk_k(D)),c:pk_h(E))", "Bdusem"); ms_test("andor(multi(2,A,B,C),and_b(after(500000001),ac:pk_k(D)),multi(2,E,F,G))", "Bdusem"); @@ -12149,7 +12149,7 @@ mod tests { ms_test("andor(c:pk_k(A),after(500000001),c:pk_h(B))", "Bsdem"); ms_test("andor(multi(2,A,B,C),c:pk_h(D),or_d(multi(2,E,F,G),multi(2,I,J,K)))", "Bdusem"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(1),after(1)),multi(2,G,I,J))", "Bsdem"); - ms_test("andor(multi(2,A,B,C),dv:after(1),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndv:after(1),multi(2,D,E,F))", "Bdusem"); ms_test("andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J),j:multi(2,K,L,M))", "Bsdum"); ms_test("and_b(and_b(multi(2,A,B,C),a:after(1)),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsnum"); ms_test("and_v(v:andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),multi(2,G,I,J))", "Bsfum"); @@ -12211,7 +12211,7 @@ mod tests { ms_test("andor(c:pk_k(A),after(1),0)", "Bdosem"); ms_test("and_b(or_i(multi(2,A,B,C),0),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsdum"); ms_test("andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),after(500000001),j:multi(2,G,I,J))", "Bsdm"); - ms_test("andor(multi(2,A,B,C),jdv:after(500000001),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),njdv:after(500000001),multi(2,D,E,F))", "Bdusem"); ms_test("and_b(andor(multi(2,A,B,C),after(500000001),multi(2,D,E,F)),a:after(500000001))", "Bsum"); ms_test("and_v(v:or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C))", "Bsum"); ms_test("j:and_v(v:multi(2,A,B,C),c:pk_k(D))", "Bndusem"); @@ -12220,7 +12220,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_d(multi(2,G,I,J),or_d(multi(2,K,L,M),multi(2,N,O,P))))", "Bdusem"); ms_test("and_v(vj:multi(2,A,B,C),1)", "Bfnusm"); ms_test("and_v(v:after(1),c:and_v(v:after(1),pk_h(A)))", "Bsnum"); - ms_test("andor(multi(2,A,B,C),jdv:after(500000001),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),njdv:after(500000001),multi(2,D,E,F))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),thresh(2,multi(2,D,E,F),a:multi(2,G,I,J),a:multi(2,K,L,M)))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),andor(multi(2,D,E,F),after(500000001),0))", "Bsdem"); ms_test("and_v(v:and_v(v:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F))", "Bfnusm"); @@ -12236,7 +12236,7 @@ mod tests { ms_test("and_b(multi(2,A,B,C),a:and_b(multi(2,D,E,F),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bndusm"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(G)))", "Bdusem"); ms_test("and_b(n:after(500000001),a:or_d(multi(2,A,B,C),multi(2,D,E,F)))", "Bsum"); - ms_test("andor(dv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),or_i(0,c:pk_h(D)))", "Bsdum"); ms_test("andor(or_d(multi(2,A,B,C),c:pk_h(D)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,E,F,G))", "Bdusem"); ms_test("or_d(c:andor(multi(2,A,B,C),pk_k(D),pk_h(E)),multi(2,F,G,I))", "Bdusem"); @@ -12316,13 +12316,13 @@ mod tests { ms_test("or_d(c:pk_h(A),or_i(0,c:pk_k(B)))", "Bsdum"); ms_test("andor(multi(2,A,B,C),j:multi(2,D,E,F),multi(2,G,I,J))", "Bdusem"); ms_test("andor(c:pk_h(A),jc:pk_h(B),multi(2,C,D,E))", "Bdusem"); - ms_test("andor(multi(2,A,B,C),dv:after(500000001),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndv:after(500000001),multi(2,D,E,F))", "Bdusem"); ms_test("and_v(v:or_i(0,multi(2,A,B,C)),after(1))", "Bsfm"); ms_test("or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),andor(multi(2,G,I,J),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,K,L,M))))", "Bdusem"); ms_test("or_i(0,or_i(or_i(multi(2,A,B,C),0),0))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),j:and_b(multi(2,D,E,F),a:after(500000001)))", "Bsdum"); ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_i(0,multi(2,A,B,C)))", "Bsnum"); - ms_test("andor(c:pk_h(A),dv:after(1),multi(2,B,C,D))", "Bdusem"); + ms_test("andor(c:pk_h(A),ndv:after(1),multi(2,B,C,D))", "Bdusem"); ms_test("jc:and_v(v:multi(2,A,B,C),pk_k(D))", "Bndusem"); ms_test("and_b(or_b(multi(2,A,B,C),a:multi(2,D,E,F)),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsdum"); ms_test("j:and_v(v:multi(2,A,B,C),or_d(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bndusem"); @@ -12393,7 +12393,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),j:multi(2,G,I,J))", "Bsdum"); ms_test("or_b(multi(2,A,B,C),a:or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bdusem"); ms_test("jnj:and_v(v:multi(2,A,B,C),after(500000001))", "Bndusm"); - ms_test("c:andor(dv:after(500000001),pk_h(A),pk_h(B))", "Bsdum"); + ms_test("c:andor(ndv:after(500000001),pk_h(A),pk_h(B))", "Bsdum"); ms_test("andor(or_i(0,n:after(1)),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("and_v(v:or_i(multi(2,A,B,C),0),after(1))", "Bsfm"); ms_test("andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),or_d(multi(2,G,I,J),after(500000001)),multi(2,K,L,M))", "Bsdem"); @@ -12424,12 +12424,12 @@ mod tests { ms_test("jj:and_v(vc:pk_h(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bndusm"); ms_test("andor(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),multi(2,D,E,F),multi(2,G,I,J))", "Bdusem"); ms_test("or_i(0,or_d(multi(2,A,B,C),j:multi(2,D,E,F)))", "Bsdum"); - ms_test("and_b(c:pk_h(A),adv:after(1))", "Bndusm"); + ms_test("and_b(c:pk_h(A),andv:after(1))", "Bndusm"); ms_test("n:andor(multi(2,A,B,C),after(1),j:multi(2,D,E,F))", "Bsdum"); ms_test("andor(multi(2,A,B,C),after(1),andor(multi(2,D,E,F),after(500000001),multi(2,G,I,J)))", "Bsdem"); ms_test("or_d(or_d(multi(2,A,B,C),c:pk_h(D)),multi(2,E,F,G))", "Bdusem"); ms_test("and_b(and_v(vc:pk_h(A),after(500000001)),ac:pk_k(B))", "Bfnusm"); - ms_test("c:andor(dv:after(1),pk_h(A),pk_h(B))", "Bsdum"); + ms_test("c:andor(ndv:after(1),pk_h(A),pk_h(B))", "Bsdum"); ms_test("n:andor(c:pk_k(A),after(1),multi(2,B,C,D))", "Bdusem"); ms_test("c:and_v(vn:after(500000001),pk_k(A))", "Bnousm"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(1),after(1)),multi(2,G,I,J))", "Bsdem"); @@ -12524,7 +12524,7 @@ mod tests { ms_test("thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),ac:pk_h(G))", "Bdusem"); ms_test("andor(multi(2,A,B,C),n:after(500000001),multi(2,D,E,F))", "Bdusem"); ms_test("and_b(jc:pk_k(A),a:multi(2,B,C,D))", "Bndusm"); - ms_test("andor(dv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("or_d(c:pk_h(A),j:multi(2,B,C,D))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,D,E,F)))", "Bsum"); ms_test("c:and_v(vn:after(1),pk_k(A))", "Bnousm"); @@ -12548,7 +12548,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),and_b(multi(2,G,I,J),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsdum"); ms_test("or_d(c:pk_h(A),jc:pk_k(B))", "Bsdum"); ms_test("and_b(c:pk_k(A),a:multi(2,B,C,D))", "Bndusem"); - ms_test("thresh(2,multi(2,A,B,C),sdv:after(500000001),a:multi(2,D,E,F))", "Bsdum"); + ms_test("thresh(2,multi(2,A,B,C),sndv:after(500000001),a:multi(2,D,E,F))", "Bsdum"); ms_test("and_v(v:and_v(v:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bfnusm"); ms_test("c:and_v(and_v(v:after(1),v:after(1)),pk_h(A))", "Bsnum"); ms_test("and_v(v:and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,A,B,C))", "Bsnum"); @@ -12576,7 +12576,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),and_v(v:multi(2,G,I,J),after(1)))", "Bsfm"); ms_test("and_v(v:after(1),and_v(v:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bfnusm"); ms_test("or_d(multi(2,A,B,C),j:and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)))", "Bsdum"); - ms_test("and_v(vjdv:after(1),multi(2,A,B,C))", "Bsnum"); + ms_test("and_v(vjndv:after(1),multi(2,A,B,C))", "Bsnum"); ms_test("andor(multi(2,A,B,C),j:multi(2,D,E,F),or_d(multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); ms_test("andor(or_b(multi(2,A,B,C),a:multi(2,D,E,F)),n:after(500000001),multi(2,G,I,J))", "Bdusem"); ms_test("and_v(and_v(v:multi(2,A,B,C),v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bfnusm"); @@ -12612,7 +12612,7 @@ mod tests { ms_test("and_v(or_c(c:pk_h(A),v:multi(2,B,C,D)),after(500000001))", "Bsfm"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(1),after(1)),multi(2,G,I,J))", "Bsdem"); ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_b(multi(2,A,B,C),sc:pk_k(D)))", "Bsnum"); - ms_test("c:andor(dv:after(1),pk_h(A),pk_k(B))", "Bsdum"); + ms_test("c:andor(ndv:after(1),pk_h(A),pk_k(B))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),n:andor(multi(2,D,E,F),after(500000001),multi(2,G,I,J)))", "Bdusem"); ms_test("and_v(v:andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F))", "Bsum"); ms_test("and_v(v:or_d(multi(2,A,B,C),multi(2,D,E,F)),n:after(1))", "Bsfum"); @@ -12725,7 +12725,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),or_i(0,c:pk_k(D)),j:multi(2,E,F,G))", "Bsdum"); ms_test("or_d(c:pk_k(A),jc:pk_k(B))", "Bsdum"); ms_test("andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J),0)", "Bdusem"); - ms_test("andor(multi(2,A,B,C),dvn:after(500000001),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndvn:after(500000001),multi(2,D,E,F))", "Bdusem"); ms_test("and_b(or_b(multi(2,A,B,C),a:multi(2,D,E,F)),a:after(1))", "Bsum"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,G,I,J))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),andor(multi(2,D,E,F),multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); @@ -12767,7 +12767,7 @@ mod tests { ms_test("and_v(or_c(multi(2,A,B,C),v:multi(2,D,E,F)),after(500000001))", "Bsfm"); ms_test("n:andor(multi(2,A,B,C),or_d(c:pk_h(D),after(500000001)),multi(2,E,F,G))", "Bdusem"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_i(0,multi(2,G,I,J)))", "Bsdum"); - ms_test("and_b(c:pk_k(A),adv:after(500000001))", "Bndusm"); + ms_test("and_b(c:pk_k(A),andv:after(500000001))", "Bndusm"); ms_test("or_b(or_d(multi(2,A,B,C),multi(2,D,E,F)),a:multi(2,G,I,J))", "Bdusem"); ms_test("and_b(and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sc:pk_k(A)),a:after(1))", "Bsnum"); ms_test("or_d(c:pk_h(A),and_v(v:multi(2,B,C,D),multi(2,E,F,G)))", "Bsfum"); @@ -12783,7 +12783,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),after(1)),multi(2,G,I,J))", "Bsdem"); ms_test("or_b(andor(multi(2,A,B,C),multi(2,D,E,F),multi(2,G,I,J)),a:multi(2,K,L,M))", "Bdusem"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); - ms_test("andor(multi(2,A,B,C),dv:after(500000001),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndv:after(500000001),multi(2,D,E,F))", "Bdusem"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F))", "Bdusem"); ms_test("and_v(and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),v:multi(2,A,B,C)),after(1))", "Bsnfm"); ms_test("thresh(2,multi(2,A,B,C),a:or_d(multi(2,D,E,F),multi(2,G,I,J)),a:multi(2,K,L,M))", "Bdusem"); @@ -12863,8 +12863,8 @@ mod tests { ms_test("c:and_v(v:after(500000001),and_v(v:after(500000001),pk_h(A)))", "Bsnum"); ms_test("c:and_v(vjc:pk_k(A),pk_k(B))", "Bfnusm"); ms_test("or_b(multi(2,A,B,C),a:andor(multi(2,D,E,F),multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); - ms_test("andor(multi(2,A,B,C),dv:after(1),multi(2,D,E,F))", "Bdusem"); - ms_test("andor(dv:after(500000001),multi(2,A,B,C),j:multi(2,D,E,F))", "Bsdum"); + ms_test("andor(multi(2,A,B,C),ndv:after(1),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(ndv:after(500000001),multi(2,A,B,C),j:multi(2,D,E,F))", "Bsdum"); ms_test("or_d(c:pk_k(A),and_v(v:multi(2,B,C,D),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsfum"); ms_test("andor(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),after(1),multi(2,D,E,F))", "Bsdem"); ms_test("and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:and_b(multi(2,A,B,C),a:after(1)))", "Bsnum"); @@ -12875,7 +12875,7 @@ mod tests { ms_test("or_i(j:and_b(multi(2,A,B,C),a:multi(2,D,E,F)),0)", "Bsdum"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),j:multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); ms_test("andor(multi(2,A,B,C),after(500000001),or_b(multi(2,D,E,F),a:multi(2,G,I,J)))", "Bsdem"); - ms_test("andor(dv:after(1),j:multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndv:after(1),j:multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),or_d(c:pk_h(D),multi(2,E,F,G)))", "Bdusem"); ms_test("and_b(and_v(v:after(1),multi(2,A,B,C)),a:after(1))", "Bsnum"); ms_test("or_d(multi(2,A,B,C),and_b(or_d(multi(2,D,E,F),multi(2,G,I,J)),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsdum"); @@ -13152,7 +13152,7 @@ mod tests { ms_test("or_d(multi(2,A,B,C),or_d(c:pk_h(D),j:multi(2,E,F,G)))", "Bsdum"); ms_test("andor(multi(2,A,B,C),n:after(1),j:multi(2,D,E,F))", "Bsdum"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_d(multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); - ms_test("andor(multi(2,A,B,C),dvn:after(1),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndvn:after(1),multi(2,D,E,F))", "Bdusem"); ms_test("or_d(or_d(or_d(multi(2,A,B,C),c:pk_h(D)),multi(2,E,F,G)),multi(2,I,J,K))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),j:multi(2,G,I,J)))", "Bsdum"); ms_test("j:and_v(vj:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bndusem"); @@ -13294,7 +13294,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),after(1),c:pk_k(D))", "Bsdem"); ms_test("and_v(or_c(multi(2,A,B,C),v:or_i(0,after(500000001))),multi(2,D,E,F))", "Bsum"); ms_test("or_d(multi(2,A,B,C),and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),aj:multi(2,D,E,F)))", "Bsdum"); - ms_test("and_b(dv:after(500000001),ac:pk_h(A))", "Bndusm"); + ms_test("and_b(ndv:after(500000001),ac:pk_h(A))", "Bndusm"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,D,E,F))", "Bsdum"); ms_test("andor(multi(2,A,B,C),and_b(multi(2,D,E,F),a:after(500000001)),multi(2,G,I,J))", "Bdusem"); ms_test("or_d(c:pk_k(A),and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,B,C,D)))", "Bsum"); @@ -13329,8 +13329,8 @@ mod tests { ms_test("or_i(andor(multi(2,A,B,C),after(1),0),0)", "Bsdm"); ms_test("or_d(multi(2,A,B,C),and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sc:pk_k(D)))", "Bsdum"); ms_test("c:andor(multi(2,A,B,C),pk_h(D),pk_h(E))", "Bdusem"); - ms_test("thresh(2,dv:after(500000001),a:multi(2,A,B,C),a:multi(2,D,E,F))", "Bsdum"); - ms_test("and_b(dv:after(500000001),sc:pk_k(A))", "Bndusm"); + ms_test("thresh(2,ndv:after(500000001),a:multi(2,A,B,C),a:multi(2,D,E,F))", "Bsdum"); + ms_test("and_b(ndv:after(500000001),sc:pk_k(A))", "Bndusm"); ms_test("and_b(jc:pk_k(A),sc:pk_k(B))", "Bndusm"); ms_test("and_v(v:and_v(v:after(500000001),multi(2,A,B,C)),multi(2,D,E,F))", "Bfnusm"); ms_test("or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),or_i(multi(2,G,I,J),0)))", "Bsdum"); @@ -13385,7 +13385,7 @@ mod tests { ms_test("and_b(and_b(multi(2,A,B,C),a:after(500000001)),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsnum"); ms_test("c:andor(c:pk_h(A),pk_k(B),pk_h(C))", "Bdusem"); ms_test("or_d(andor(c:pk_h(A),multi(2,B,C,D),multi(2,E,F,G)),multi(2,I,J,K))", "Bdusem"); - ms_test("c:andor(dv:after(1),pk_k(A),pk_k(B))", "Bsdum"); + ms_test("c:andor(ndv:after(1),pk_k(A),pk_k(B))", "Bsdum"); ms_test("andor(multi(2,A,B,C),or_b(multi(2,D,E,F),a:multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); ms_test("andor(multi(2,A,B,C),or_b(multi(2,D,E,F),a:multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); ms_test("and_v(or_c(multi(2,A,B,C),vc:pk_h(D)),after(500000001))", "Bsfm"); @@ -13450,7 +13450,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:multi(2,D,E,F)),0)", "Bdusem"); ms_test("c:and_v(or_c(multi(2,A,B,C),v:after(1)),pk_h(D))", "Bsum"); ms_test("andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),or_d(multi(2,G,I,J),multi(2,K,L,M)),multi(2,N,O,P))", "Bdusem"); - ms_test("andor(dvn:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndvn:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("andor(c:pk_h(A),after(1),j:multi(2,B,C,D))", "Bsdm"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),0)", "Bdusem"); ms_test("and_v(or_c(multi(2,A,B,C),v:after(500000001)),and_v(v:multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsfum"); @@ -13468,7 +13468,7 @@ mod tests { ms_test("andor(c:pk_h(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),j:multi(2,B,C,D))", "Bsdum"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); ms_test("and_b(or_b(multi(2,A,B,C),a:multi(2,D,E,F)),a:multi(2,G,I,J))", "Bdusem"); - ms_test("thresh(2,multi(2,A,B,C),sdv:after(1),a:multi(2,D,E,F))", "Bsdum"); + ms_test("thresh(2,multi(2,A,B,C),sndv:after(1),a:multi(2,D,E,F))", "Bsdum"); ms_test("andor(multi(2,A,B,C),after(500000001),or_b(multi(2,D,E,F),a:multi(2,G,I,J)))", "Bsdem"); ms_test("andor(c:pk_h(A),after(500000001),and_b(after(500000001),a:multi(2,B,C,D)))", "Bsm"); ms_test("or_d(multi(2,A,B,C),andor(multi(2,D,E,F),after(1),multi(2,G,I,J)))", "Bsdem"); @@ -13556,13 +13556,13 @@ mod tests { ms_test("and_b(or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),a:multi(2,D,E,F))", "Bsdum"); ms_test("andor(multi(2,A,B,C),and_v(v:after(1),after(1)),multi(2,D,E,F))", "Bsdem"); ms_test("or_d(c:pk_h(A),or_d(multi(2,B,C,D),c:pk_h(E)))", "Bdusem"); - ms_test("andor(multi(2,A,B,C),or_b(multi(2,D,E,F),sdv:after(1)),multi(2,G,I,J))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),or_b(multi(2,D,E,F),sndv:after(1)),multi(2,G,I,J))", "Bdusem"); ms_test("andor(multi(2,A,B,C),and_v(v:multi(2,D,E,F),after(1)),multi(2,G,I,J))", "Bsdem"); ms_test("andor(multi(2,A,B,C),after(500000001),j:multi(2,D,E,F))", "Bsdm"); ms_test("or_i(j:and_b(multi(2,A,B,C),a:after(500000001)),0)", "Bsdum"); ms_test("or_d(multi(2,A,B,C),or_d(c:pk_h(D),c:pk_h(E)))", "Bdusem"); ms_test("and_v(v:multi(2,A,B,C),and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bfnusm"); - ms_test("and_b(multi(2,A,B,C),a:or_d(dv:after(1),multi(2,D,E,F)))", "Bndusm"); + ms_test("and_b(multi(2,A,B,C),a:or_d(ndv:after(1),multi(2,D,E,F)))", "Bndusm"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,G,I,J)),0)", "Bdusem"); ms_test("andor(c:pk_h(A),after(1),jc:pk_h(B))", "Bsdm"); ms_test("andor(multi(2,A,B,C),n:after(1),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bdusem"); @@ -13619,7 +13619,7 @@ mod tests { ms_test("and_v(or_c(multi(2,A,B,C),v:and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))),multi(2,D,E,F))", "Bsum"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),andor(multi(2,G,I,J),multi(2,K,L,M),multi(2,N,O,P)))", "Bdusem"); ms_test("or_i(and_b(c:pk_h(A),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),0)", "Bsdum"); - ms_test("andor(multi(2,A,B,C),or_d(dv:after(1),multi(2,D,E,F)),multi(2,G,I,J))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),or_d(ndv:after(1),multi(2,D,E,F)),multi(2,G,I,J))", "Bdusem"); ms_test("c:andor(multi(2,A,B,C),pk_k(D),andor(multi(2,E,F,G),pk_h(I),pk_h(J)))", "Bdusem"); ms_test("andor(multi(2,A,B,C),after(500000001),multi(2,D,E,F))", "Bsdem"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J)),0)", "Bdusem"); @@ -13728,14 +13728,14 @@ mod tests { ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),after(500000001)),andor(multi(2,G,I,J),after(500000001),multi(2,K,L,M)))", "Bsdem"); ms_test("andor(multi(2,A,B,C),or_d(c:pk_h(D),multi(2,E,F,G)),multi(2,I,J,K))", "Bdusem"); ms_test("andor(or_b(multi(2,A,B,C),a:multi(2,D,E,F)),after(500000001),multi(2,G,I,J))", "Bsdem"); - ms_test("and_b(multi(2,A,B,C),adv:after(500000001))", "Bndusm"); + ms_test("and_b(multi(2,A,B,C),andv:after(500000001))", "Bndusm"); ms_test("or_b(multi(2,A,B,C),a:andor(multi(2,D,E,F),after(1),multi(2,G,I,J)))", "Bdusem"); ms_test("and_b(multi(2,A,B,C),a:and_b(after(500000001),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsnum"); ms_test("and_v(and_v(v:after(1),v:after(1)),multi(2,A,B,C))", "Bsnum"); ms_test("and_v(or_c(multi(2,A,B,C),or_c(multi(2,D,E,F),v:multi(2,G,I,J))),multi(2,K,L,M))", "Bsfum"); ms_test("or_i(0,or_d(multi(2,A,B,C),j:multi(2,D,E,F)))", "Bsdum"); ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_v(v:after(1),multi(2,A,B,C)))", "Bsnum"); - ms_test("thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),adv:after(500000001))", "Bsdum"); + ms_test("thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),andv:after(500000001))", "Bsdum"); ms_test("andor(multi(2,A,B,C),c:pk_k(D),or_d(multi(2,E,F,G),multi(2,I,J,K)))", "Bdusem"); ms_test("and_b(and_b(after(500000001),ac:pk_h(A)),a:after(500000001))", "Bsum"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(multi(2,D,E,F),multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); @@ -13791,7 +13791,7 @@ mod tests { ms_test("and_v(v:after(500000001),and_v(v:multi(2,A,B,C),after(500000001)))", "Bsnfm"); ms_test("andor(multi(2,A,B,C),c:pk_k(D),andor(multi(2,E,F,G),j:multi(2,I,J,K),multi(2,L,M,N)))", "Bdusem"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_i(0,multi(2,G,I,J)))", "Bsdum"); - ms_test("thresh(2,multi(2,A,B,C),sdv:after(1),sc:pk_k(D))", "Bsdum"); + ms_test("thresh(2,multi(2,A,B,C),sndv:after(1),sc:pk_k(D))", "Bsdum"); ms_test("andor(multi(2,A,B,C),j:multi(2,D,E,F),c:pk_k(G))", "Bdusem"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),after(1)),multi(2,G,I,J))", "Bsdem"); ms_test("or_i(or_i(0,j:multi(2,A,B,C)),0)", "Bsdum"); @@ -13852,7 +13852,7 @@ mod tests { ms_test("andor(c:pk_h(A),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_v(v:after(500000001),multi(2,B,C,D)))", "Bsum"); ms_test("and_b(multi(2,A,B,C),a:after(500000001))", "Bsnum"); ms_test("and_b(after(500000001),sc:pk_k(A))", "Bsum"); - ms_test("and_b(multi(2,A,B,C),sdv:after(1))", "Bndusm"); + ms_test("and_b(multi(2,A,B,C),sndv:after(1))", "Bndusm"); ms_test("or_b(multi(2,A,B,C),a:multi(2,D,E,F))", "Bdusem"); ms_test("andor(andor(multi(2,A,B,C),multi(2,D,E,F),multi(2,G,I,J)),multi(2,K,L,M),multi(2,N,O,P))", "Bdusem"); ms_test("or_d(or_d(c:pk_h(A),c:pk_h(B)),multi(2,C,D,E))", "Bdusem"); @@ -13887,7 +13887,7 @@ mod tests { ms_test("or_i(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),0)", "Bsdum"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),multi(2,G,I,J),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,K,L,M))", "Bdusem"); ms_test("andor(c:pk_k(A),n:after(1),c:pk_h(B))", "Bdusem"); - ms_test("thresh(2,multi(2,A,B,C),adv:after(500000001),a:multi(2,D,E,F))", "Bsdum"); + ms_test("thresh(2,multi(2,A,B,C),andv:after(500000001),a:multi(2,D,E,F))", "Bsdum"); ms_test("and_b(after(500000001),a:and_b(multi(2,A,B,C),a:multi(2,D,E,F)))", "Bsum"); ms_test("andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0)", "Bdusem"); ms_test("or_i(c:and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),pk_k(A)),0)", "Bsdum"); @@ -13917,7 +13917,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),andor(multi(2,G,I,J),multi(2,K,L,M),multi(2,N,O,P)))", "Bdusem"); ms_test("and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),a:and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,A,B,C)))", "Bsnum"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),or_d(multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); - ms_test("andor(dvn:after(500000001),j:multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndvn:after(500000001),j:multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("and_v(or_c(multi(2,A,B,C),or_c(multi(2,D,E,F),v:after(500000001))),multi(2,G,I,J))", "Bsum"); ms_test("and_v(or_c(multi(2,A,B,C),vj:multi(2,D,E,F)),multi(2,G,I,J))", "Bsfum"); ms_test("andor(c:pk_h(A),after(500000001),multi(2,B,C,D))", "Bsdem"); @@ -13926,7 +13926,7 @@ mod tests { ms_test("and_v(v:or_i(n:after(1),0),multi(2,A,B,C))", "Bsum"); ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_v(v:multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bfnusm"); ms_test("or_d(multi(2,A,B,C),andor(multi(2,D,E,F),j:multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); - ms_test("andor(multi(2,A,B,C),dv:after(500000001),c:pk_h(D))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndv:after(500000001),c:pk_h(D))", "Bdusem"); ms_test("and_v(v:andor(multi(2,A,B,C),after(1),after(1)),multi(2,D,E,F))", "Bsum"); ms_test("andor(c:pk_h(A),c:pk_h(B),0)", "Bdusem"); ms_test("andor(multi(2,A,B,C),after(1),or_b(multi(2,D,E,F),a:multi(2,G,I,J)))", "Bsdem"); @@ -14090,7 +14090,7 @@ mod tests { ms_test("and_b(or_d(multi(2,A,B,C),multi(2,D,E,F)),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsdum"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(500000001),after(500000001)),c:pk_k(G))", "Bsdem"); ms_test("and_v(v:multi(2,A,B,C),andor(multi(2,D,E,F),multi(2,G,I,J),multi(2,K,L,M)))", "Bfnusm"); - ms_test("andor(multi(2,A,B,C),jdv:after(500000001),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),njdv:after(500000001),multi(2,D,E,F))", "Bdusem"); ms_test("andor(multi(2,A,B,C),c:pk_k(D),multi(2,E,F,G))", "Bdusem"); ms_test("andor(multi(2,A,B,C),or_i(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),c:pk_k(D))", "Bdusem"); ms_test("and_v(v:andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,D,E,F)),after(500000001))", "Bsfm"); @@ -14222,7 +14222,7 @@ mod tests { ms_test("j:and_v(v:after(500000001),c:pk_h(A))", "Bndusm"); ms_test("and_v(v:andor(multi(2,A,B,C),n:after(500000001),after(500000001)),multi(2,D,E,F))", "Bsum"); ms_test("andor(multi(2,A,B,C),after(1),andor(multi(2,D,E,F),multi(2,G,I,J),multi(2,K,L,M)))", "Bsdem"); - ms_test("andor(dv:after(1),multi(2,A,B,C),c:pk_k(D))", "Bsdum"); + ms_test("andor(ndv:after(1),multi(2,A,B,C),c:pk_k(D))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),or_i(0,j:multi(2,D,E,F)))", "Bsdum"); ms_test("or_d(or_d(or_d(c:pk_h(A),multi(2,B,C,D)),multi(2,E,F,G)),multi(2,I,J,K))", "Bdusem"); ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),andor(multi(2,G,I,J),after(1),0))", "Bsdem"); @@ -14246,19 +14246,19 @@ mod tests { ms_test("andor(c:pk_h(A),c:pk_k(B),multi(2,C,D,E))", "Bdusem"); ms_test("and_b(or_b(multi(2,A,B,C),ac:pk_h(D)),a:after(1))", "Bsum"); ms_test("and_b(c:and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),pk_h(A)),a:multi(2,B,C,D))", "Bsnum"); - ms_test("and_b(or_d(multi(2,A,B,C),multi(2,D,E,F)),adv:after(1))", "Bsdum"); - ms_test("c:andor(dv:after(500000001),pk_k(A),pk_h(B))", "Bsdum"); + ms_test("and_b(or_d(multi(2,A,B,C),multi(2,D,E,F)),andv:after(1))", "Bsdum"); + ms_test("c:andor(ndv:after(500000001),pk_k(A),pk_h(B))", "Bsdum"); ms_test("and_v(v:or_i(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),0),j:multi(2,A,B,C))", "Bsum"); ms_test("and_v(and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),v:multi(2,A,B,C)),after(1))", "Bsnfm"); ms_test("or_d(multi(2,A,B,C),or_d(c:pk_h(D),j:multi(2,E,F,G)))", "Bsdum"); ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),j:multi(2,D,E,F)))", "Bsnum"); ms_test("c:andor(c:pk_h(A),pk_k(B),pk_k(C))", "Bdusem"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),andor(multi(2,G,I,J),multi(2,K,L,M),multi(2,N,O,P)))", "Bdusem"); - ms_test("andor(multi(2,A,B,C),dv:after(1),j:multi(2,D,E,F))", "Bsdum"); + ms_test("andor(multi(2,A,B,C),ndv:after(1),j:multi(2,D,E,F))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),andor(multi(2,D,E,F),after(500000001),multi(2,G,I,J)))", "Bsdem"); ms_test("or_d(andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),c:pk_h(D)),multi(2,E,F,G))", "Bdusem"); ms_test("andor(multi(2,A,B,C),after(1),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "Bsdem"); - ms_test("andor(or_d(dv:after(1),multi(2,A,B,C)),multi(2,D,E,F),multi(2,G,I,J))", "Bsdum"); + ms_test("andor(or_d(ndv:after(1),multi(2,A,B,C)),multi(2,D,E,F),multi(2,G,I,J))", "Bsdum"); ms_test("or_d(c:andor(multi(2,A,B,C),pk_k(D),pk_k(E)),multi(2,F,G,I))", "Bdusem"); ms_test("and_v(andor(c:pk_k(A),v:after(500000001),v:after(500000001)),multi(2,B,C,D))", "Bsum"); ms_test("or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),or_i(0,multi(2,G,I,J))))", "Bsdum"); @@ -14470,7 +14470,7 @@ mod tests { ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),or_d(multi(2,G,I,J),multi(2,K,L,M)))", "Bdusem"); ms_test("or_d(or_b(multi(2,A,B,C),a:multi(2,D,E,F)),c:pk_h(G))", "Bdusem"); ms_test("andor(multi(2,A,B,C),n:after(1),jc:pk_h(D))", "Bsdum"); - ms_test("and_b(multi(2,A,B,C),adv:after(1))", "Bndusm"); + ms_test("and_b(multi(2,A,B,C),andv:after(1))", "Bndusm"); ms_test("or_d(or_d(or_b(multi(2,A,B,C),sc:pk_k(D)),multi(2,E,F,G)),multi(2,I,J,K))", "Bdusem"); ms_test("or_i(0,jc:pk_h(A))", "Bsdum"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(500000001),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,G,I,J))", "Bsdem"); @@ -14570,7 +14570,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(500000001),after(500000001)),multi(2,G,I,J))", "Bsdem"); ms_test("andor(c:pk_h(A),after(500000001),j:multi(2,B,C,D))", "Bsdm"); ms_test("or_b(c:pk_h(A),sc:pk_k(B))", "Bdusem"); - ms_test("andor(multi(2,A,B,C),dv:after(1),0)", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndv:after(1),0)", "Bdusem"); ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),c:pk_h(G))", "Bdusem"); ms_test("or_b(andor(multi(2,A,B,C),after(1),multi(2,D,E,F)),a:multi(2,G,I,J))", "Bdusem"); ms_test("or_d(or_d(c:pk_h(A),multi(2,B,C,D)),c:pk_k(E))", "Bdusem"); @@ -14636,7 +14636,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),j:multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); ms_test("or_d(multi(2,A,B,C),c:and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),pk_h(D)))", "Bsum"); ms_test("or_d(multi(2,A,B,C),or_d(or_d(multi(2,D,E,F),multi(2,G,I,J)),or_d(multi(2,K,L,M),multi(2,N,O,P))))", "Bdusem"); - ms_test("c:andor(dv:after(1),pk_k(A),pk_h(B))", "Bsdum"); + ms_test("c:andor(ndv:after(1),pk_k(A),pk_h(B))", "Bsdum"); ms_test("and_b(multi(2,A,B,C),a:or_i(n:after(500000001),0))", "Bndusm"); ms_test("and_b(n:after(500000001),aj:multi(2,A,B,C))", "Bsum"); ms_test("or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),or_b(multi(2,G,I,J),a:multi(2,K,L,M)))", "Bdusem"); @@ -14717,7 +14717,7 @@ mod tests { ms_test("c:andor(multi(2,A,B,C),pk_k(D),pk_k(E))", "Bdusem"); ms_test("or_i(and_v(v:after(500000001),c:pk_h(A)),0)", "Bsdum"); ms_test("andor(multi(2,A,B,C),after(500000001),c:pk_k(D))", "Bsdem"); - ms_test("andor(dv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("or_d(multi(2,A,B,C),or_i(or_i(multi(2,D,E,F),0),0))", "Bsdum"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_b(multi(2,G,I,J),a:multi(2,K,L,M)))", "Bdusem"); ms_test("andor(multi(2,A,B,C),and_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,D,E,F))", "Bdusem"); @@ -14735,7 +14735,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),andor(multi(2,G,I,J),multi(2,K,L,M),multi(2,N,O,P)))", "Bdusem"); ms_test("andor(c:pk_h(A),or_d(multi(2,B,C,D),after(500000001)),multi(2,E,F,G))", "Bsdem"); ms_test("andor(or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J))),multi(2,K,L,M),multi(2,N,O,P))", "Bdusem"); - ms_test("and_b(dv:after(1),ac:pk_k(A))", "Bndusm"); + ms_test("and_b(ndv:after(1),ac:pk_k(A))", "Bndusm"); ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),andor(multi(2,A,B,C),multi(2,D,E,F),multi(2,G,I,J)))", "Bsnum"); ms_test("or_d(multi(2,A,B,C),and_v(v:after(1),multi(2,D,E,F)))", "Bsum"); ms_test("and_b(or_d(multi(2,A,B,C),j:multi(2,D,E,F)),a:after(500000001))", "Bsum"); @@ -14806,8 +14806,8 @@ mod tests { ms_test("or_i(or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J)),0)", "Bsdum"); ms_test("or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),jc:pk_k(G)))", "Bsdum"); ms_test("or_i(0,or_d(c:pk_h(A),multi(2,B,C,D)))", "Bsdum"); - ms_test("and_v(v:multi(2,A,B,C),dv:after(500000001))", "Bfnusm"); - ms_test("andor(multi(2,A,B,C),dv:after(500000001),multi(2,D,E,F))", "Bdusem"); + ms_test("and_v(v:multi(2,A,B,C),ndv:after(500000001))", "Bfnusm"); + ms_test("andor(multi(2,A,B,C),ndv:after(500000001),multi(2,D,E,F))", "Bdusem"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),after(500000001)),multi(2,G,I,J))", "Bsdem"); ms_test("or_d(or_d(multi(2,A,B,C),c:pk_k(D)),multi(2,E,F,G))", "Bdusem"); ms_test("c:and_v(v:after(500000001),and_v(v:after(500000001),pk_h(A)))", "Bsnum"); @@ -14834,7 +14834,7 @@ mod tests { ms_test("n:andor(c:pk_k(A),after(1),multi(2,B,C,D))", "Bdusem"); ms_test("thresh(2,multi(2,A,B,C),sc:pk_k(D),a:multi(2,E,F,G))", "Bdusem"); ms_test("andor(c:pk_h(A),c:pk_h(B),j:multi(2,C,D,E))", "Bsdum"); - ms_test("andor(multi(2,A,B,C),dv:after(500000001),0)", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndv:after(500000001),0)", "Bdusem"); ms_test("and_v(v:or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),or_b(multi(2,D,E,F),a:multi(2,G,I,J)))", "Bsum"); ms_test("and_v(v:andor(multi(2,A,B,C),after(500000001),multi(2,D,E,F)),after(500000001))", "Bsfm"); ms_test("or_d(multi(2,A,B,C),andor(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,G,I,J)))", "Bdusem"); @@ -14871,19 +14871,19 @@ mod tests { ms_test("andor(or_d(or_d(multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J)),after(500000001),c:pk_k(K))", "Bsdem"); ms_test("andor(multi(2,A,B,C),or_i(or_i(multi(2,D,E,F),0),0),multi(2,G,I,J))", "Bdusem"); ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(500000001),after(500000001)),0)", "Bsdem"); - ms_test("andor(dv:after(1),multi(2,A,B,C),c:pk_k(D))", "Bsdum"); + ms_test("andor(ndv:after(1),multi(2,A,B,C),c:pk_k(D))", "Bsdum"); ms_test("and_v(v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),multi(2,D,E,F)))", "Bsnum"); ms_test("andor(multi(2,A,B,C),and_b(multi(2,D,E,F),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),multi(2,G,I,J))", "Bdusem"); ms_test("and_b(or_d(multi(2,A,B,C),after(1)),aj:multi(2,D,E,F))", "Bsum"); ms_test("and_b(c:and_v(v:after(500000001),pk_h(A)),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))", "Bsnum"); ms_test("or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),c:pk_h(G)))", "Bdusem"); ms_test("andor(multi(2,A,B,C),after(500000001),andor(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),multi(2,G,I,J)))", "Bsdem"); - ms_test("andor(multi(2,A,B,C),dvn:after(500000001),multi(2,D,E,F))", "Bdusem"); + ms_test("andor(multi(2,A,B,C),ndvn:after(500000001),multi(2,D,E,F))", "Bdusem"); ms_test("c:and_v(or_c(multi(2,A,B,C),or_c(multi(2,D,E,F),v:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc))),pk_k(G))", "Bsum"); ms_test("andor(multi(2,A,B,C),after(500000001),or_d(multi(2,D,E,F),j:multi(2,G,I,J)))", "Bsdm"); ms_test("or_i(or_d(multi(2,A,B,C),j:multi(2,D,E,F)),0)", "Bsdum"); ms_test("or_d(multi(2,A,B,C),or_i(0,j:multi(2,D,E,F)))", "Bsdum"); - ms_test("andor(dvn:after(1),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); + ms_test("andor(ndvn:after(1),multi(2,A,B,C),multi(2,D,E,F))", "Bsdum"); ms_test("n:andor(multi(2,A,B,C),after(1),c:pk_k(D))", "Bdusem"); ms_test("or_i(or_b(multi(2,A,B,C),sc:pk_k(D)),0)", "Bsdum"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),or_d(or_d(multi(2,G,I,J),multi(2,K,L,M)),c:pk_h(N)))", "Bdusem"); @@ -14891,7 +14891,7 @@ mod tests { ms_test("and_b(after(1),ajc:pk_k(A))", "Bsum"); ms_test("n:and_v(or_c(multi(2,A,B,C),v:multi(2,D,E,F)),after(500000001))", "Bsfum"); ms_test("and_v(v:after(500000001),and_v(v:after(500000001),multi(2,A,B,C)))", "Bsnum"); - ms_test("and_v(vj:multi(2,A,B,C),dv:after(500000001))", "Bfnusm"); + ms_test("and_v(vj:multi(2,A,B,C),ndv:after(500000001))", "Bfnusm"); ms_test("and_v(v:multi(2,A,B,C),andor(multi(2,D,E,F),after(1),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsnfm"); ms_test("or_d(c:pk_h(A),and_b(multi(2,B,C,D),s:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsdum"); ms_test("andor(multi(2,A,B,C),j:multi(2,D,E,F),j:multi(2,G,I,J))", "Bsdum"); @@ -14991,7 +14991,7 @@ mod tests { ms_test("n:andor(or_d(multi(2,A,B,C),multi(2,D,E,F)),after(500000001),multi(2,G,I,J))", "Bdusem"); ms_test("andor(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),and_b(after(500000001),a:multi(2,D,E,F)))", "Bsum"); ms_test("and_b(or_d(multi(2,A,B,C),multi(2,D,E,F)),aj:multi(2,G,I,J))", "Bsdum"); - ms_test("and_b(c:pk_h(A),adv:after(500000001))", "Bndusm"); + ms_test("and_b(c:pk_h(A),andv:after(500000001))", "Bndusm"); ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),j:multi(2,G,I,J)),multi(2,K,L,M))", "Bdusem"); ms_test("or_d(c:andor(multi(2,A,B,C),pk_k(D),pk_h(E)),multi(2,F,G,I))", "Bdusem"); ms_test("and_b(multi(2,A,B,C),a:and_b(after(500000001),a:sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)))", "Bsnum"); @@ -15463,7 +15463,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,D,E,F)),multi(2,G,I,J))", "dBesu"); ms_test("or_b(multi(2,A,B,C),aj:and_b(multi(2,D,E,F),a:after(500000001)))", "dBesu"); ms_test("and_v(vc:pk_h(A),thresh(2,j:multi(2,B,C,D),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "Bsufn"); - ms_test("andor(multi(2,A,B,C),or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),dv:after(1))),multi(2,D,E,F))", "dBesu"); + ms_test("andor(multi(2,A,B,C),or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),ndv:after(1))),multi(2,D,E,F))", "dBesu"); ms_test("c:andor(jc:pk_h(A),pk_h(B),pk_k(C))", "dBesu"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),and_b(after(1),a:multi(2,A,B,C)),multi(2,D,E,F))", "usdB"); ms_test("c:andor(or_d(multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),pk_k(D),pk_h(E))", "usdB"); @@ -15643,7 +15643,7 @@ mod tests { ms_test("or_d(or_i(0,or_i(0,multi(2,A,B,C))),multi(2,D,E,F))", "dBesu"); ms_test("or_b(or_i(multi(2,A,B,C),0),sc:pk_k(D))", "dBesu"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,G,I,J),0))", "usdB"); - ms_test("andor(j:multi(2,A,B,C),dv:after(1),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(1),multi(2,D,E,F))", "udBes"); ms_test("and_b(c:pk_k(A),a:or_d(j:multi(2,B,C,D),after(500000001)))", "usBn"); ms_test("andor(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F)),after(1)),multi(2,G,I,J))", "esdB"); ms_test("andor(multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),j:multi(2,D,E,F))", "usdB"); @@ -15716,7 +15716,7 @@ mod tests { ms_test("or_d(multi(2,A,B,C),or_d(j:multi(2,D,E,F),c:pk_k(G)))", "dBesu"); ms_test("or_d(j:multi(2,A,B,C),or_d(j:multi(2,D,E,F),multi(2,G,I,J)))", "dBesu"); ms_test("or_d(andor(j:multi(2,A,B,C),multi(2,D,E,F),0),multi(2,G,I,J))", "dBesu"); - ms_test("c:andor(jdv:after(500000001),pk_k(A),pk_h(B))", "usdB"); + ms_test("c:andor(jndv:after(500000001),pk_k(A),pk_h(B))", "usdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),andor(multi(2,D,E,F),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),0))", "usdB"); ms_test("c:andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,A,B,C)),pk_h(D),pk_h(E))", "usdB"); ms_test("andor(or_i(0,multi(2,A,B,C)),multi(2,D,E,F),multi(2,G,I,J))", "dBesu"); @@ -15814,7 +15814,7 @@ mod tests { ms_test("andor(or_i(0,c:pk_k(A)),or_i(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),0),0)", "dBesu"); ms_test("and_b(or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),ac:pk_h(A))", "usdB"); ms_test("andor(or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); - ms_test("andor(jdv:after(500000001),multi(2,A,B,C),j:multi(2,D,E,F))", "usdB"); + ms_test("andor(njdv:after(500000001),multi(2,A,B,C),j:multi(2,D,E,F))", "usdB"); ms_test("andor(multi(2,A,B,C),multi(2,D,E,F),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,G,I,J),multi(2,K,L,M)))", "usdB"); ms_test("c:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),and_v(v:after(1),pk_h(A)),pk_k(B))", "usdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,A,B,C),c:pk_k(D))", "usdB"); @@ -16005,7 +16005,7 @@ mod tests { ms_test("c:andor(or_i(0,multi(2,A,B,C)),pk_k(D),pk_k(E))", "dBesu"); ms_test("c:andor(or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),pk_h(A),pk_h(B))", "usdB"); ms_test("andor(or_i(0,multi(2,A,B,C)),after(1),c:pk_h(D))", "esdB"); - ms_test("andor(c:pk_k(A),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),dv:after(500000001),after(500000001)),multi(2,B,C,D))", "esdB"); + ms_test("andor(c:pk_k(A),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),ndv:after(500000001),after(500000001)),multi(2,B,C,D))", "esdB"); ms_test("andor(j:multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F))", "dBesu"); ms_test("or_d(j:multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "dBesu"); ms_test("c:andor(or_i(j:multi(2,A,B,C),0),pk_h(D),pk_h(E))", "dBesu"); @@ -16059,7 +16059,7 @@ mod tests { ms_test("or_d(j:multi(2,A,B,C),or_d(j:multi(2,D,E,F),multi(2,G,I,J)))", "dBesu"); ms_test("and_v(v:multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F),multi(2,G,I,J)))", "Bsufn"); ms_test("andor(or_d(multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),c:pk_h(D),multi(2,E,F,G))", "usdB"); - ms_test("andor(j:multi(2,A,B,C),dv:after(1),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(1),multi(2,D,E,F))", "dBesu"); ms_test("or_d(or_i(c:pk_h(A),0),c:pk_h(B))", "dBesu"); ms_test("or_b(multi(2,A,B,C),a:and_b(multi(2,D,E,F),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "dBesu"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_d(c:pk_k(D),multi(2,E,F,G)))", "usdB"); @@ -16083,7 +16083,7 @@ mod tests { ms_test("or_d(or_d(multi(2,A,B,C),or_i(0,multi(2,D,E,F))),multi(2,G,I,J))", "dBesu"); ms_test("andor(or_i(0,multi(2,A,B,C)),after(1),c:pk_k(D))", "esdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_k(A),c:pk_h(B))", "usdB"); - ms_test("and_v(v:multi(2,A,B,C),or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sdv:after(500000001)))", "Bsufn"); + ms_test("and_v(v:multi(2,A,B,C),or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sndv:after(500000001)))", "Bsufn"); ms_test("or_b(multi(2,A,B,C),a:and_b(c:pk_k(D),a:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b))))", "dBesu"); ms_test("andor(j:multi(2,A,B,C),or_i(after(500000001),0),multi(2,D,E,F))", "esdB"); ms_test("andor(jc:pk_k(A),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,B,C,D)),multi(2,E,F,G))", "dBesu"); @@ -16367,7 +16367,7 @@ mod tests { ms_test("and_v(v:multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,D,E,F)))", "Bsufn"); ms_test("or_d(or_i(or_d(multi(2,A,B,C),multi(2,D,E,F)),0),multi(2,G,I,J))", "dBesu"); ms_test("or_d(j:and_b(multi(2,A,B,C),a:multi(2,D,E,F)),multi(2,G,I,J))", "dBesu"); - ms_test("thresh(2,multi(2,A,B,C),ajdv:after(500000001),a:multi(2,D,E,F))", "usdB"); + ms_test("thresh(2,multi(2,A,B,C),anjdv:after(500000001),a:multi(2,D,E,F))", "usdB"); ms_test("or_d(or_i(0,c:pk_k(A)),c:pk_k(B))", "dBesu"); ms_test("and_b(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),multi(2,D,E,F)),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b))", "usdB"); ms_test("andor(jc:pk_h(A),after(500000001),multi(2,B,C,D))", "esdB"); @@ -16764,7 +16764,7 @@ mod tests { ms_test("and_b(after(500000001),ac:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),pk_k(A),pk_h(B)))", "usB"); ms_test("thresh(2,j:multi(2,A,B,C),a:multi(2,D,E,F),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b))", "usdB"); ms_test("andor(or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b))),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); - ms_test("and_b(c:pk_h(A),a:or_d(dv:after(1),after(1)))", "usBn"); + ms_test("and_b(c:pk_h(A),a:or_d(ndv:after(1),after(1)))", "usBn"); ms_test("and_b(or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),ac:pk_k(A))", "usdB"); ms_test("andor(jc:pk_k(A),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,B,C,D))", "dBesu"); ms_test("and_b(multi(2,A,B,C),a:thresh(2,multi(2,D,E,F),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,G,I,J)))", "dBsun"); @@ -17141,7 +17141,7 @@ mod tests { ms_test("and_v(or_c(j:multi(2,A,B,C),v:multi(2,D,E,F)),1)", "usBf"); ms_test("n:andor(j:multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1)),multi(2,D,E,F))", "dBesu"); ms_test("andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J),multi(2,K,L,M))", "dBesu"); - ms_test("thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),a:or_b(dv:after(1),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "usdB"); + ms_test("thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),a:or_b(ndv:after(1),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "usdB"); ms_test("or_d(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),c:pk_h(D)),multi(2,E,F,G))", "dBesu"); ms_test("andor(or_d(multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,D,E,F),c:pk_h(G))", "usdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),or_d(multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J))", "usdB"); @@ -17206,7 +17206,7 @@ mod tests { ms_test("andor(jc:pk_k(A),after(500000001),c:pk_k(B))", "esdB"); ms_test("or_d(j:multi(2,A,B,C),or_i(multi(2,D,E,F),0))", "usdB"); ms_test("and_b(or_b(j:multi(2,A,B,C),a:multi(2,D,E,F)),a:after(1))", "usB"); - ms_test("andor(j:multi(2,A,B,C),dv:after(1),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(1),multi(2,D,E,F))", "dBesu"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),jc:pk_h(A),c:pk_h(B))", "usdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),or_d(multi(2,A,B,C),multi(2,D,E,F)),c:pk_h(G))", "usdB"); ms_test("or_d(c:pk_h(A),and_b(multi(2,B,C,D),a:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001))))", "usB"); @@ -17366,12 +17366,12 @@ mod tests { ms_test("andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C)),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,D,E,F),multi(2,G,I,J))", "usdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_d(or_i(0,multi(2,D,E,F)),multi(2,G,I,J)))", "usdB"); ms_test("n:andor(or_d(multi(2,A,B,C),or_i(0,multi(2,D,E,F))),after(500000001),multi(2,G,I,J))", "dBesu"); - ms_test("andor(or_d(dv:after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C),0)", "usdB"); + ms_test("andor(or_d(ndv:after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C),0)", "usdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_d(multi(2,D,E,F),c:pk_k(G)))", "usdB"); ms_test("or_d(or_d(j:multi(2,A,B,C),multi(2,D,E,F)),c:pk_k(G))", "dBesu"); ms_test("andor(or_d(j:multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,D,E,F),multi(2,G,I,J))", "usdB"); ms_test("andor(jc:pk_k(A),after(500000001),multi(2,B,C,D))", "esdB"); - ms_test("andor(j:multi(2,A,B,C),dv:after(1),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(1),multi(2,D,E,F))", "dBesu"); ms_test("andor(or_i(0,or_d(multi(2,A,B,C),multi(2,D,E,F))),after(1),0)", "esdB"); ms_test("and_v(v:multi(2,A,B,C),or_d(or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),after(500000001)))", "sBfn"); ms_test("or_d(thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,G,I,J))", "dBesu"); @@ -17548,7 +17548,7 @@ mod tests { ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),andor(multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),0),multi(2,D,E,F))", "usdB"); ms_test("or_b(j:multi(2,A,B,C),ac:pk_k(D))", "dBesu"); ms_test("and_b(after(1),a:or_b(multi(2,A,B,C),aj:multi(2,D,E,F)))", "usB"); - ms_test("andor(jdv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); + ms_test("andor(njdv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("or_d(j:multi(2,A,B,C),andor(multi(2,D,E,F),multi(2,G,I,J),multi(2,K,L,M)))", "dBesu"); ms_test("andor(and_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,A,B,C)),n:after(1),multi(2,D,E,F))", "dBesu"); ms_test("or_b(j:and_b(multi(2,A,B,C),a:after(1)),a:multi(2,D,E,F))", "dBesu"); @@ -17624,7 +17624,7 @@ mod tests { ms_test("c:andor(jc:pk_k(A),pk_h(B),pk_k(C))", "dBesu"); ms_test("c:andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_k(A),multi(2,B,C,D)),pk_k(E),pk_k(F))", "dBesu"); ms_test("thresh(2,j:multi(2,A,B,C),a:multi(2,D,E,F),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b))", "usdB"); - ms_test("andor(j:multi(2,A,B,C),dv:after(500000001),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(500000001),multi(2,D,E,F))", "dBesu"); ms_test("or_d(or_d(c:pk_k(A),j:multi(2,B,C,D)),multi(2,E,F,G))", "dBesu"); ms_test("or_d(or_i(or_d(multi(2,A,B,C),multi(2,D,E,F)),0),multi(2,G,I,J))", "dBesu"); ms_test("andor(jc:pk_h(A),after(500000001),j:multi(2,B,C,D))", "sdB"); @@ -17782,7 +17782,7 @@ mod tests { ms_test("j:and_b(multi(2,A,B,C),an:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1)))", "dBsun"); ms_test("n:andor(multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)),multi(2,D,E,F))", "dBesu"); ms_test("andor(multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1)),multi(2,D,E,F))", "esdB"); - ms_test("andor(j:multi(2,A,B,C),dv:after(500000001),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(500000001),multi(2,D,E,F))", "dBesu"); ms_test("or_d(or_b(j:multi(2,A,B,C),a:multi(2,D,E,F)),multi(2,G,I,J))", "dBesu"); ms_test("andor(or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,A,B,C)),multi(2,D,E,F),multi(2,G,I,J))", "usdB"); ms_test("or_i(0,or_d(j:multi(2,A,B,C),multi(2,D,E,F)))", "usdB"); @@ -17836,7 +17836,7 @@ mod tests { ms_test("or_d(or_i(0,j:multi(2,A,B,C)),multi(2,D,E,F))", "dBesu"); ms_test("andor(j:multi(2,A,B,C),c:pk_h(D),multi(2,E,F,G))", "dBesu"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),multi(2,D,E,F)),j:multi(2,G,I,J))", "usdB"); - ms_test("and_b(c:pk_k(A),a:or_b(dv:after(1),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "dBsun"); + ms_test("and_b(c:pk_k(A),a:or_b(ndv:after(1),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "dBsun"); ms_test("and_b(andor(j:multi(2,A,B,C),c:pk_h(D),multi(2,E,F,G)),a:after(500000001))", "usB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_d(multi(2,D,E,F),c:pk_k(G)))", "usdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_b(multi(2,D,E,F),aj:multi(2,G,I,J)))", "usdB"); @@ -17954,7 +17954,7 @@ mod tests { ms_test("or_d(or_i(0,multi(2,A,B,C)),j:multi(2,D,E,F))", "usdB"); ms_test("and_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:and_b(multi(2,A,B,C),a:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1))))", "usBn"); ms_test("and_b(j:multi(2,A,B,C),s:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)))", "usBn"); - ms_test("andor(j:multi(2,A,B,C),dv:after(500000001),0)", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(500000001),0)", "dBesu"); ms_test("and_v(vc:pk_h(A),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_h(B)))", "Bsufn"); ms_test("or_d(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J))", "dBesu"); ms_test("andor(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1),multi(2,D,E,F)),multi(2,G,I,J))", "esdB"); @@ -17966,7 +17966,7 @@ mod tests { ms_test("or_d(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,D,E,F),multi(2,G,I,J)))", "usdB"); ms_test("c:and_v(v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)),pk_h(A))", "usB"); ms_test("and_b(multi(2,A,B,C),a:or_d(or_d(multi(2,D,E,F),or_d(multi(2,G,I,J),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b))),after(500000001)))", "usBn"); - ms_test("c:andor(jdv:after(1),pk_h(A),pk_h(B))", "usdB"); + ms_test("c:andor(njdv:after(1),pk_h(A),pk_h(B))", "usdB"); ms_test("andor(multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F)),multi(2,G,I,J))", "dBesu"); ms_test("andor(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F)),multi(2,G,I,J))", "dBesu"); ms_test("andor(or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); @@ -18053,7 +18053,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),thresh(2,multi(2,D,E,F),a:multi(2,G,I,J),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "usdB"); ms_test("and_v(v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C)),c:pk_k(D))", "usB"); ms_test("and_b(or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,A,B,C)),a:multi(2,D,E,F))", "usdB"); - ms_test("andor(j:multi(2,A,B,C),dv:after(500000001),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(500000001),multi(2,D,E,F))", "dBesu"); ms_test("and_v(v:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),multi(2,D,E,F)))", "usBn"); ms_test("c:andor(jc:pk_k(A),pk_h(B),pk_k(C))", "dBesu"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_i(0,multi(2,D,E,F)))", "usdB"); @@ -18158,7 +18158,7 @@ mod tests { ms_test("or_b(multi(2,A,B,C),a:or_i(0,multi(2,D,E,F)))", "dBesu"); ms_test("and_b(multi(2,A,B,C),an:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)))", "usBn"); ms_test("andor(and_b(multi(2,A,B,C),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),after(500000001),multi(2,D,E,F))", "esdB"); - ms_test("and_b(c:pk_k(A),s:or_d(dv:after(1),after(1)))", "usBn"); + ms_test("and_b(c:pk_k(A),s:or_d(ndv:after(1),after(1)))", "usBn"); ms_test("and_b(multi(2,A,B,C),a:or_d(j:multi(2,D,E,F),after(500000001)))", "usBn"); ms_test("or_d(multi(2,A,B,C),or_d(or_i(multi(2,D,E,F),0),multi(2,G,I,J)))", "dBesu"); ms_test("andor(or_i(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),0),multi(2,A,B,C),j:multi(2,D,E,F))", "usdB"); @@ -18186,7 +18186,7 @@ mod tests { ms_test("and_v(or_c(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C))),multi(2,D,E,F))", "usB"); ms_test("or_i(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),multi(2,D,E,F)),0)", "usdB"); ms_test("andor(jc:pk_k(A),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,B,C,D))", "usdB"); - ms_test("andor(jdv:after(1),multi(2,A,B,C),0)", "usdB"); + ms_test("andor(njdv:after(1),multi(2,A,B,C),0)", "usdB"); ms_test("andor(multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F)),multi(2,G,I,J))", "dBesu"); ms_test("or_d(or_i(c:pk_h(A),0),j:multi(2,B,C,D))", "usdB"); ms_test("or_b(or_i(0,multi(2,A,B,C)),a:multi(2,D,E,F))", "dBesu"); @@ -18203,7 +18203,7 @@ mod tests { ms_test("c:and_v(v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),or_i(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),0)),pk_h(A))", "usB"); ms_test("or_b(c:pk_k(A),aj:multi(2,B,C,D))", "dBesu"); ms_test("andor(j:multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J)),multi(2,K,L,M))", "dBesu"); - ms_test("or_b(and_b(dv:after(1),a:multi(2,A,B,C)),a:multi(2,D,E,F))", "dBesu"); + ms_test("or_b(and_b(ndv:after(1),a:multi(2,A,B,C)),a:multi(2,D,E,F))", "dBesu"); ms_test("or_d(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F),multi(2,G,I,J)))", "usdB"); ms_test("or_d(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_h(D),multi(2,E,F,G)))", "usdB"); ms_test("andor(j:multi(2,A,B,C),after(500000001),andor(multi(2,D,E,F),after(500000001),multi(2,G,I,J)))", "esdB"); @@ -18297,7 +18297,7 @@ mod tests { ms_test("or_d(multi(2,A,B,C),andor(multi(2,D,E,F),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,G,I,J)))", "dBesu"); ms_test("and_v(v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),or_d(multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b))),multi(2,D,E,F))", "usB"); ms_test("andor(multi(2,A,B,C),after(1),c:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),pk_h(D),pk_h(E)))", "sdB"); - ms_test("or_b(multi(2,A,B,C),a:andor(dv:after(500000001),multi(2,D,E,F),0))", "dBesu"); + ms_test("or_b(multi(2,A,B,C),a:andor(ndv:after(500000001),multi(2,D,E,F),0))", "dBesu"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_d(multi(2,D,E,F),j:multi(2,G,I,J)))", "usdB"); ms_test("and_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:or_b(multi(2,A,B,C),aj:multi(2,D,E,F)))", "dBsun"); ms_test("andor(or_i(j:multi(2,A,B,C),0),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F))", "dBesu"); @@ -18454,7 +18454,7 @@ mod tests { ms_test("andor(or_d(c:pk_k(A),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,B,C,D),multi(2,E,F,G))", "usdB"); ms_test("or_d(multi(2,A,B,C),or_d(or_i(0,multi(2,D,E,F)),multi(2,G,I,J)))", "dBesu"); ms_test("andor(j:multi(2,A,B,C),after(1),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "esdB"); - ms_test("andor(multi(2,A,B,C),andor(dv:after(500000001),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)),0)", "esdB"); + ms_test("andor(multi(2,A,B,C),andor(ndv:after(500000001),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)),0)", "esdB"); ms_test("andor(or_i(multi(2,A,B,C),0),after(500000001),c:pk_h(D))", "esdB"); ms_test("andor(or_d(c:pk_k(A),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,B,C,D),multi(2,E,F,G))", "usdB"); ms_test("andor(j:multi(2,A,B,C),j:multi(2,D,E,F),j:multi(2,G,I,J))", "usdB"); @@ -18756,7 +18756,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),or_b(multi(2,D,E,F),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),j:multi(2,G,I,J))", "usdB"); ms_test("and_v(v:thresh(2,sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,A,B,C),a:multi(2,D,E,F)),after(1))", "sBf"); ms_test("and_b(c:pk_h(A),a:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,B,C,D)))", "dBsun"); - ms_test("and_v(v:or_d(dv:after(1),after(1)),multi(2,A,B,C))", "usB"); + ms_test("and_v(v:or_d(ndv:after(1),after(1)),multi(2,A,B,C))", "usB"); ms_test("andor(j:multi(2,A,B,C),or_i(0,after(1)),multi(2,D,E,F))", "esdB"); ms_test("and_b(multi(2,A,B,C),a:or_d(j:multi(2,D,E,F),after(500000001)))", "usBn"); ms_test("or_b(c:pk_h(A),sjc:pk_k(B))", "dBesu"); @@ -18801,7 +18801,7 @@ mod tests { ms_test("and_v(v:or_b(multi(2,A,B,C),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,D,E,F))", "usB"); ms_test("and_b(andor(j:multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F)),a:after(1))", "usB"); ms_test("and_v(v:multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "Bsufn"); - ms_test("andor(jdv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); + ms_test("andor(njdv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("andor(or_i(multi(2,A,B,C),0),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_h(D))", "dBesu"); ms_test("and_b(multi(2,A,B,C),a:or_d(j:multi(2,D,E,F),after(1)))", "usBn"); ms_test("andor(or_i(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),0),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); @@ -18952,9 +18952,9 @@ mod tests { ms_test("and_v(v:multi(2,A,B,C),or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "Bsufn"); ms_test("or_d(j:multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F),multi(2,G,I,J)))", "usdB"); ms_test("j:and_v(v:multi(2,A,B,C),n:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1)))", "dBesun"); - ms_test("and_v(v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),dv:after(1)),multi(2,A,B,C))", "usB"); + ms_test("and_v(v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),ndv:after(1)),multi(2,A,B,C))", "usB"); ms_test("or_i(0,andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),multi(2,D,E,F)))", "usdB"); - ms_test("andor(jdv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); + ms_test("andor(njdv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),or_d(j:multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J))", "usdB"); ms_test("or_d(or_d(multi(2,A,B,C),or_i(0,multi(2,D,E,F))),multi(2,G,I,J))", "dBesu"); ms_test("andor(multi(2,A,B,C),n:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1)),multi(2,D,E,F))", "dBesu"); @@ -18984,7 +18984,7 @@ mod tests { ms_test("or_i(0,or_d(or_i(multi(2,A,B,C),0),multi(2,D,E,F)))", "usdB"); ms_test("or_d(multi(2,A,B,C),or_d(or_i(0,multi(2,D,E,F)),multi(2,G,I,J)))", "dBesu"); ms_test("and_b(multi(2,A,B,C),a:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F)))", "dBsun"); - ms_test("andor(j:multi(2,A,B,C),jdv:after(1),c:pk_h(D))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),njdv:after(1),c:pk_h(D))", "dBesu"); ms_test("and_v(v:multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F)))", "Bsufn"); ms_test("or_d(j:multi(2,A,B,C),jc:pk_h(D))", "usdB"); ms_test("andor(multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)),j:multi(2,D,E,F))", "sdB"); @@ -19110,7 +19110,7 @@ mod tests { ms_test("or_d(multi(2,A,B,C),or_d(jc:pk_k(D),multi(2,E,F,G)))", "dBesu"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),jc:pk_h(D))", "usdB"); ms_test("n:andor(multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1)),multi(2,D,E,F))", "dBesu"); - ms_test("and_b(or_d(dv:after(500000001),after(500000001)),a:multi(2,A,B,C))", "usB"); + ms_test("and_b(or_d(ndv:after(500000001),after(500000001)),a:multi(2,A,B,C))", "usB"); ms_test("or_b(jc:pk_h(A),a:multi(2,B,C,D))", "dBesu"); ms_test("andor(j:multi(2,A,B,C),after(500000001),multi(2,D,E,F))", "esdB"); ms_test("or_b(or_d(multi(2,A,B,C),j:multi(2,D,E,F)),a:multi(2,G,I,J))", "dBesu"); @@ -19193,7 +19193,7 @@ mod tests { ms_test("or_d(or_d(multi(2,A,B,C),j:multi(2,D,E,F)),c:pk_k(G))", "dBesu"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J)))", "usdB"); ms_test("andor(multi(2,A,B,C),or_b(multi(2,D,E,F),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),0)", "dBesu"); - ms_test("andor(or_d(dv:after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); + ms_test("andor(or_d(ndv:after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("or_b(c:pk_k(A),sjc:pk_k(B))", "dBesu"); ms_test("andor(jc:pk_h(A),n:after(500000001),multi(2,B,C,D))", "dBesu"); ms_test("or_d(and_b(multi(2,A,B,C),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),j:multi(2,D,E,F))", "usdB"); @@ -19260,7 +19260,7 @@ mod tests { ms_test("or_d(or_i(multi(2,A,B,C),0),j:multi(2,D,E,F))", "usdB"); ms_test("and_v(or_c(j:multi(2,A,B,C),v:multi(2,D,E,F)),after(500000001))", "sBf"); ms_test("andor(multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),c:pk_h(D))", "dBesu"); - ms_test("andor(j:multi(2,A,B,C),dv:after(500000001),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(500000001),multi(2,D,E,F))", "dBesu"); ms_test("n:and_v(v:multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)))", "Bsufn"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),or_i(multi(2,A,B,C),0),j:multi(2,D,E,F))", "usdB"); ms_test("and_b(or_b(j:multi(2,A,B,C),a:multi(2,D,E,F)),a:after(500000001))", "usB"); @@ -19314,7 +19314,7 @@ mod tests { ms_test("andor(j:multi(2,A,B,C),or_i(0,sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,D,E,F))", "dBesu"); ms_test("c:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),pk_h(A),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),pk_h(B),pk_h(C)))", "usdB"); ms_test("or_d(or_i(0,c:pk_h(A)),c:pk_h(B))", "dBesu"); - ms_test("andor(jdv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); + ms_test("andor(njdv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("or_d(thresh(2,multi(2,A,B,C),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,D,E,F)),c:pk_k(G))", "dBesu"); ms_test("thresh(2,sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,A,B,C),sc:pk_k(D))", "usdB"); ms_test("or_d(or_i(0,c:pk_h(A)),c:pk_h(B))", "dBesu"); @@ -19346,7 +19346,7 @@ mod tests { ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),0),0)", "usdB"); ms_test("or_d(multi(2,A,B,C),or_d(or_i(0,multi(2,D,E,F)),multi(2,G,I,J)))", "dBesu"); ms_test("and_v(or_c(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),v:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001),after(500000001))),multi(2,A,B,C))", "usB"); - ms_test("andor(or_i(0,or_d(multi(2,A,B,C),dv:after(1))),c:pk_k(D),0)", "usdB"); + ms_test("andor(or_i(0,or_d(multi(2,A,B,C),ndv:after(1))),c:pk_k(D),0)", "usdB"); ms_test("c:and_v(or_c(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),v:multi(2,A,B,C)),pk_h(D))", "usB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_h(A),j:multi(2,B,C,D))", "usdB"); ms_test("and_b(multi(2,A,B,C),a:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F),multi(2,G,I,J)))", "dBsun"); @@ -19438,7 +19438,7 @@ mod tests { ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_h(A),or_d(multi(2,B,C,D),multi(2,E,F,G)))", "usdB"); ms_test("andor(j:multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F)),multi(2,G,I,J))", "dBesu"); ms_test("and_v(v:after(500000001),thresh(2,sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,A,B,C),a:multi(2,D,E,F)))", "usB"); - ms_test("and_v(v:or_d(or_d(dv:after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C))", "usB"); + ms_test("and_v(v:or_d(or_d(ndv:after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C))", "usB"); ms_test("and_b(c:pk_h(A),s:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)))", "usBn"); ms_test("or_b(jc:pk_k(A),a:multi(2,B,C,D))", "dBesu"); ms_test("andor(c:pk_h(A),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,B,C,D)),multi(2,E,F,G))", "dBesu"); @@ -19486,7 +19486,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)),c:pk_k(D))", "esdB"); ms_test("andor(thresh(2,multi(2,A,B,C),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,D,E,F)),after(1),multi(2,G,I,J))", "esdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_d(c:pk_h(D),multi(2,E,F,G)))", "usdB"); - ms_test("c:andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),dv:after(1),multi(2,A,B,C)),pk_h(D),pk_k(E))", "usdB"); + ms_test("c:andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),ndv:after(1),multi(2,A,B,C)),pk_h(D),pk_k(E))", "usdB"); ms_test("or_b(c:pk_h(A),aj:multi(2,B,C,D))", "dBesu"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,A,B,C),c:pk_h(D))", "usdB"); ms_test("n:andor(jc:pk_h(A),after(500000001),multi(2,B,C,D))", "dBesu"); @@ -19548,7 +19548,7 @@ mod tests { ms_test("andor(or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C),0)", "usdB"); ms_test("or_d(or_d(or_i(multi(2,A,B,C),0),multi(2,D,E,F)),multi(2,G,I,J))", "dBesu"); ms_test("andor(multi(2,A,B,C),after(1),or_d(j:multi(2,D,E,F),multi(2,G,I,J)))", "esdB"); - ms_test("andor(j:multi(2,A,B,C),dv:after(1),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(1),multi(2,D,E,F))", "dBesu"); ms_test("c:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),pk_h(A),pk_k(B))", "usdB"); ms_test("and_b(n:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001),after(500000001)),sc:pk_k(A))", "usB"); ms_test("andor(thresh(2,multi(2,A,B,C),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,D,E,F)),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,G,I,J))", "dBesu"); @@ -20008,7 +20008,7 @@ mod tests { ms_test("andor(and_b(multi(2,A,B,C),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),after(1),multi(2,D,E,F))", "esdB"); ms_test("or_d(or_d(multi(2,A,B,C),j:multi(2,D,E,F)),j:multi(2,G,I,J))", "usdB"); ms_test("or_d(or_i(0,c:pk_k(A)),multi(2,B,C,D))", "dBesu"); - ms_test("andor(multi(2,A,B,C),or_d(dv:after(500000001),after(500000001)),multi(2,D,E,F))", "esdB"); + ms_test("andor(multi(2,A,B,C),or_d(ndv:after(500000001),after(500000001)),multi(2,D,E,F))", "esdB"); ms_test("or_d(or_d(j:multi(2,A,B,C),multi(2,D,E,F)),j:multi(2,G,I,J))", "usdB"); ms_test("andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C)),multi(2,D,E,F),multi(2,G,I,J))", "usdB"); ms_test("and_v(v:multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "sBfn"); @@ -20021,7 +20021,7 @@ mod tests { ms_test("and_v(v:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C)),multi(2,D,E,F))", "usB"); ms_test("or_b(or_i(multi(2,A,B,C),0),a:multi(2,D,E,F))", "dBesu"); ms_test("and_b(after(1),a:andor(jc:pk_h(A),after(1),c:pk_k(B)))", "usB"); - ms_test("andor(multi(2,A,B,C),n:or_d(dv:after(1),after(1)),0)", "dBesu"); + ms_test("andor(multi(2,A,B,C),n:or_d(ndv:after(1),after(1)),0)", "dBesu"); ms_test("andor(c:pk_k(A),after(500000001),c:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),pk_h(B),pk_k(C)))", "sdB"); ms_test("n:andor(or_i(multi(2,A,B,C),0),after(500000001),multi(2,D,E,F))", "dBesu"); ms_test("or_d(or_i(0,j:multi(2,A,B,C)),j:multi(2,D,E,F))", "usdB"); @@ -20042,7 +20042,7 @@ mod tests { ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),multi(2,D,E,F)),0)", "usdB"); ms_test("or_b(multi(2,A,B,C),ac:andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),pk_h(G),pk_h(I)))", "dBesu"); ms_test("or_b(c:pk_k(A),aj:multi(2,B,C,D))", "dBesu"); - ms_test("andor(jdv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); + ms_test("andor(njdv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("andor(or_d(j:multi(2,A,B,C),multi(2,D,E,F)),after(500000001),multi(2,G,I,J))", "esdB"); ms_test("and_v(v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),j:multi(2,A,B,C))", "usB"); ms_test("andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); @@ -20292,10 +20292,10 @@ mod tests { ms_test("andor(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,G,I,J))", "dBesu"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_k(A),multi(2,B,C,D))", "usdB"); ms_test("andor(multi(2,A,B,C),or_d(j:multi(2,D,E,F),after(500000001)),multi(2,G,I,J))", "esdB"); - ms_test("and_b(dv:after(1),a:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_h(A),0))", "dBsun"); + ms_test("and_b(ndv:after(1),a:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_h(A),0))", "dBsun"); ms_test("or_b(multi(2,A,B,C),a:thresh(2,multi(2,D,E,F),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,G,I,J)))", "dBesu"); ms_test("andor(or_i(multi(2,A,B,C),0),after(1),multi(2,D,E,F))", "esdB"); - ms_test("or_d(andor(dv:after(1),multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J))", "dBesu"); + ms_test("or_d(andor(ndv:after(1),multi(2,A,B,C),multi(2,D,E,F)),multi(2,G,I,J))", "dBesu"); ms_test("or_i(or_d(jc:pk_k(A),multi(2,B,C,D)),0)", "usdB"); ms_test("or_d(multi(2,A,B,C),andor(multi(2,D,E,F),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)),0))", "esdB"); ms_test("and_v(v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,A,B,C)),multi(2,D,E,F))", "usB"); @@ -20304,12 +20304,12 @@ mod tests { ms_test("and_v(v:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,D,E,F))", "usB"); ms_test("and_b(multi(2,A,B,C),a:or_i(or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1)),0))", "dBsun"); ms_test("andor(j:multi(2,A,B,C),multi(2,D,E,F),or_i(0,multi(2,G,I,J)))", "usdB"); - ms_test("andor(or_i(multi(2,A,B,C),0),dv:after(500000001),multi(2,D,E,F))", "dBesu"); + ms_test("andor(or_i(multi(2,A,B,C),0),ndv:after(500000001),multi(2,D,E,F))", "dBesu"); ms_test("and_v(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),v:after(1),v:after(1)),multi(2,A,B,C))", "usB"); ms_test("or_d(or_i(0,jc:pk_h(A)),multi(2,B,C,D))", "dBesu"); ms_test("andor(or_i(0,j:multi(2,A,B,C)),after(500000001),0)", "esdB"); ms_test("andor(or_d(j:multi(2,A,B,C),multi(2,D,E,F)),after(500000001),multi(2,G,I,J))", "esdB"); - ms_test("andor(jdv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); + ms_test("andor(njdv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("andor(multi(2,A,B,C),after(500000001),andor(j:multi(2,D,E,F),after(500000001),multi(2,G,I,J)))", "esdB"); ms_test("and_v(or_c(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),v:multi(2,A,B,C)),multi(2,D,E,F))", "usB"); ms_test("c:andor(or_i(0,sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),pk_h(A),pk_k(B))", "usdB"); @@ -20567,7 +20567,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,G,I,J))", "dBesu"); ms_test("andor(or_i(0,multi(2,A,B,C)),after(1),j:multi(2,D,E,F))", "sdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_i(0,j:multi(2,D,E,F)))", "usdB"); - ms_test("and_b(multi(2,A,B,C),a:andor(dv:after(500000001),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "dBsun"); + ms_test("and_b(multi(2,A,B,C),a:andor(ndv:after(500000001),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "dBsun"); ms_test("c:andor(or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),pk_k(A),pk_k(B))", "usdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),jc:pk_k(A),multi(2,B,C,D))", "usdB"); ms_test("or_b(or_i(j:multi(2,A,B,C),0),a:multi(2,D,E,F))", "dBesu"); @@ -20611,7 +20611,7 @@ mod tests { ms_test("and_v(v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1)),j:multi(2,A,B,C))", "usB"); ms_test("thresh(2,multi(2,A,B,C),a:or_b(multi(2,D,E,F),a:multi(2,G,I,J)),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b))", "usdB"); ms_test("and_v(v:and_v(or_c(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),v:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),after(500000001)),multi(2,A,B,C))", "usB"); - ms_test("thresh(2,dvn:after(500000001),a:multi(2,A,B,C),aj:multi(2,D,E,F))", "usdB"); + ms_test("thresh(2,ndvn:after(500000001),a:multi(2,A,B,C),aj:multi(2,D,E,F))", "usdB"); ms_test("thresh(2,multi(2,A,B,C),a:multi(2,D,E,F),aj:multi(2,G,I,J))", "dBsu"); ms_test("and_b(n:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1),after(1)),a:multi(2,A,B,C))", "usB"); ms_test("and_v(v:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_k(A),after(1)),multi(2,B,C,D))", "usB"); @@ -20656,7 +20656,7 @@ mod tests { ms_test("and_b(multi(2,A,B,C),a:or_d(j:multi(2,D,E,F),multi(2,G,I,J)))", "dBesun"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("and_v(or_c(c:pk_h(A),v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_h(B))),multi(2,C,D,E))", "usB"); - ms_test("andor(jdv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); + ms_test("andor(njdv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("andor(j:multi(2,A,B,C),after(1),and_b(after(1),ac:pk_h(D)))", "sB"); ms_test("andor(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001),after(500000001)),multi(2,D,E,F))", "esdB"); ms_test("andor(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),0)", "esdB"); @@ -20686,7 +20686,7 @@ mod tests { ms_test("andor(or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,A,B,C)),multi(2,D,E,F),multi(2,G,I,J))", "usdB"); ms_test("c:andor(jc:pk_h(A),pk_k(B),pk_k(C))", "dBesu"); ms_test("andor(or_i(0,c:pk_k(A)),n:after(500000001),0)", "dBesu"); - ms_test("andor(jdv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); + ms_test("andor(njdv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("andor(multi(2,A,B,C),c:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),pk_k(D),pk_k(E)),multi(2,F,G,I))", "dBesu"); ms_test("or_d(or_i(multi(2,A,B,C),0),c:pk_h(D))", "dBesu"); ms_test("and_v(v:or_d(j:multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,D,E,F))", "usB"); @@ -21077,7 +21077,7 @@ mod tests { ms_test("c:andor(multi(2,A,B,C),pk_h(D),andor(j:multi(2,E,F,G),pk_k(I),pk_k(J)))", "dBesu"); ms_test("and_b(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),0),a:after(500000001))", "usB"); ms_test("andor(or_i(0,multi(2,A,B,C)),after(1),j:multi(2,D,E,F))", "sdB"); - ms_test("andor(j:multi(2,A,B,C),dv:after(500000001),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(500000001),multi(2,D,E,F))", "dBesu"); ms_test("thresh(2,c:pk_k(A),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,B,C,D))", "usdB"); ms_test("c:andor(jc:pk_h(A),pk_k(B),pk_k(C))", "dBesu"); ms_test("or_d(multi(2,A,B,C),thresh(2,multi(2,D,E,F),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,G,I,J)))", "usdB"); @@ -21187,7 +21187,7 @@ mod tests { ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,A,B,C),c:pk_k(D))", "usdB"); ms_test("and_v(or_c(multi(2,A,B,C),or_c(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),v:after(500000001))),multi(2,D,E,F))", "usB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),and_v(v:after(500000001),multi(2,D,E,F)))", "usB"); - ms_test("andor(multi(2,A,B,C),or_d(dv:after(1),after(1)),multi(2,D,E,F))", "esdB"); + ms_test("andor(multi(2,A,B,C),or_d(ndv:after(1),after(1)),multi(2,D,E,F))", "esdB"); ms_test("or_d(j:and_v(v:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C)),multi(2,D,E,F))", "dBesu"); ms_test("andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),multi(2,D,E,F)),after(500000001),multi(2,G,I,J))", "esdB"); ms_test("and_v(v:multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),n:after(500000001)))", "Bsufn"); @@ -21265,7 +21265,7 @@ mod tests { ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_d(multi(2,D,E,F),c:pk_k(G)))", "usdB"); ms_test("or_d(c:pk_h(A),or_d(j:multi(2,B,C,D),multi(2,E,F,G)))", "dBesu"); ms_test("andor(or_i(multi(2,A,B,C),0),c:pk_h(D),multi(2,E,F,G))", "dBesu"); - ms_test("and_v(v:multi(2,A,B,C),n:or_d(dv:after(1),after(1)))", "Bsufn"); + ms_test("and_v(v:multi(2,A,B,C),n:or_d(ndv:after(1),after(1)))", "Bsufn"); ms_test("andor(thresh(2,multi(2,A,B,C),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,D,E,F)),after(500000001),multi(2,G,I,J))", "esdB"); ms_test("or_d(multi(2,A,B,C),or_d(j:multi(2,D,E,F),c:pk_h(G)))", "dBesu"); ms_test("and_v(vc:pk_k(A),or_d(j:multi(2,B,C,D),c:pk_k(E)))", "Bsufn"); @@ -21309,7 +21309,7 @@ mod tests { ms_test("and_b(n:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),a:multi(2,A,B,C))", "usdB"); ms_test("andor(and_b(multi(2,A,B,C),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),after(1),multi(2,D,E,F))", "esdB"); ms_test("c:and_v(or_c(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),v:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),pk_h(A))", "usB"); - ms_test("andor(jdv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); + ms_test("andor(njdv:after(1),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("andor(multi(2,A,B,C),or_d(or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,D,E,F))", "dBesu"); ms_test("andor(c:pk_k(A),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,B,C,D))", "dBesu"); ms_test("andor(or_i(0,j:multi(2,A,B,C)),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F))", "dBesu"); @@ -21392,7 +21392,7 @@ mod tests { ms_test("andor(multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1)),multi(2,D,E,F))", "esdB"); ms_test("and_v(v:multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)))", "Bsufn"); ms_test("andor(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,D,E,F))", "esdB"); - ms_test("and_v(v:or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),dv:after(1))),multi(2,A,B,C))", "usB"); + ms_test("and_v(v:or_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),ndv:after(1))),multi(2,A,B,C))", "usB"); ms_test("or_d(c:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),pk_h(A),pk_h(B)),multi(2,C,D,E))", "dBesu"); ms_test("and_v(or_c(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),v:or_d(multi(2,A,B,C),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b))),multi(2,D,E,F))", "usB"); ms_test("or_i(c:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),pk_h(A),pk_h(B)),0)", "usdB"); @@ -21616,7 +21616,7 @@ mod tests { ms_test("or_d(j:multi(2,A,B,C),and_b(after(1),a:multi(2,D,E,F)))", "usB"); ms_test("andor(and_b(multi(2,A,B,C),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),after(1),multi(2,D,E,F))", "esdB"); ms_test("or_b(multi(2,A,B,C),a:or_d(multi(2,D,E,F),j:multi(2,G,I,J)))", "dBesu"); - ms_test("c:andor(or_i(dv:after(500000001),0),pk_h(A),pk_h(B))", "usdB"); + ms_test("c:andor(or_i(ndv:after(500000001),0),pk_h(A),pk_h(B))", "usdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),or_d(c:pk_h(A),multi(2,B,C,D)),multi(2,E,F,G))", "usdB"); ms_test("or_d(multi(2,A,B,C),or_d(or_i(multi(2,D,E,F),0),multi(2,G,I,J)))", "dBesu"); ms_test("thresh(2,j:multi(2,A,B,C),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,D,E,F))", "usdB"); @@ -21624,7 +21624,7 @@ mod tests { ms_test("andor(jc:pk_h(A),multi(2,B,C,D),multi(2,E,F,G))", "dBesu"); ms_test("and_b(j:multi(2,A,B,C),a:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1)))", "usBn"); ms_test("and_v(v:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C)),multi(2,D,E,F))", "usB"); - ms_test("and_b(or_d(dv:after(1),after(1)),a:multi(2,A,B,C))", "usB"); + ms_test("and_b(or_d(ndv:after(1),after(1)),a:multi(2,A,B,C))", "usB"); ms_test("andor(j:multi(2,A,B,C),after(500000001),or_i(0,multi(2,D,E,F)))", "sdB"); ms_test("andor(jc:pk_h(A),multi(2,B,C,D),multi(2,E,F,G))", "dBesu"); ms_test("c:andor(or_i(0,multi(2,A,B,C)),pk_h(D),pk_h(E))", "dBesu"); @@ -21683,7 +21683,7 @@ mod tests { ms_test("and_v(v:multi(2,A,B,C),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),n:after(1)))", "Bsufn"); ms_test("andor(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(1)),multi(2,D,E,F))", "esdB"); ms_test("n:and_v(v:and_v(vn:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),after(500000001)),multi(2,D,E,F)),after(500000001))", "usBf"); - ms_test("andor(multi(2,A,B,C),or_d(dv:after(1),after(1)),0)", "esdB"); + ms_test("andor(multi(2,A,B,C),or_d(ndv:after(1),after(1)),0)", "esdB"); ms_test("or_d(multi(2,A,B,C),or_d(jc:pk_h(D),multi(2,E,F,G)))", "dBesu"); ms_test("or_b(multi(2,A,B,C),aj:multi(2,D,E,F))", "dBesu"); ms_test("andor(multi(2,A,B,C),thresh(2,multi(2,D,E,F),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),s:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,G,I,J))", "dBesu"); @@ -21744,7 +21744,7 @@ mod tests { ms_test("andor(or_i(0,multi(2,A,B,C)),after(1),multi(2,D,E,F))", "esdB"); ms_test("and_b(or_d(j:multi(2,A,B,C),multi(2,D,E,F)),a:after(1))", "usB"); ms_test("c:and_v(v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,A,B,C)),pk_h(D))", "usB"); - ms_test("andor(j:multi(2,A,B,C),dv:after(500000001),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(500000001),multi(2,D,E,F))", "dBesu"); ms_test("andor(j:multi(2,A,B,C),after(500000001),j:multi(2,D,E,F))", "sdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),andor(multi(2,D,E,F),after(500000001),multi(2,G,I,J)))", "sdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),or_i(0,j:multi(2,D,E,F)))", "usdB"); @@ -21811,7 +21811,7 @@ mod tests { ms_test("or_d(or_i(or_i(multi(2,A,B,C),0),0),multi(2,D,E,F))", "dBesu"); ms_test("andor(multi(2,A,B,C),or_d(j:multi(2,D,E,F),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,G,I,J))", "dBesu"); ms_test("and_b(multi(2,A,B,C),sn:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)))", "usBn"); - ms_test("j:and_b(multi(2,A,B,C),a:or_d(dv:after(500000001),after(500000001)))", "dBsun"); + ms_test("j:and_b(multi(2,A,B,C),a:or_d(ndv:after(500000001),after(500000001)))", "dBsun"); ms_test("or_d(multi(2,A,B,C),andor(j:multi(2,D,E,F),after(500000001),0))", "esdB"); ms_test("andor(j:multi(2,A,B,C),after(1),c:pk_k(D))", "esdB"); ms_test("and_v(v:or_d(or_i(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),0),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C))", "usB"); @@ -21893,7 +21893,7 @@ mod tests { ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C),and_b(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,D,E,F)))", "usdB"); ms_test("and_v(vc:pk_k(A),or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001)))", "sBfn"); ms_test("and_b(multi(2,A,B,C),s:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),after(500000001),after(500000001)))", "usBn"); - ms_test("andor(j:multi(2,A,B,C),dv:after(500000001),multi(2,D,E,F))", "dBesu"); + ms_test("andor(j:multi(2,A,B,C),ndv:after(500000001),multi(2,D,E,F))", "dBesu"); ms_test("or_d(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),j:multi(2,A,B,C),or_i(multi(2,D,E,F),0)),multi(2,G,I,J))", "dBesu"); ms_test("or_d(and_b(multi(2,A,B,C),a:sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),j:multi(2,D,E,F))", "usdB"); ms_test("thresh(2,sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),a:multi(2,A,B,C),ac:pk_h(D))", "usdB"); @@ -21941,7 +21941,7 @@ mod tests { ms_test("and_v(v:or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_h(A)),c:pk_h(B))", "usB"); ms_test("and_v(v:or_d(or_d(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,A,B,C)),n:after(1)),multi(2,D,E,F))", "usB"); ms_test("or_d(or_d(multi(2,A,B,C),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F),multi(2,G,I,J))),multi(2,K,L,M))", "dBesu"); - ms_test("andor(jdv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); + ms_test("andor(njdv:after(500000001),multi(2,A,B,C),multi(2,D,E,F))", "usdB"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),c:pk_k(A),c:pk_h(B))", "usdB"); ms_test("or_d(or_i(0,c:pk_h(A)),multi(2,B,C,D))", "dBesu"); ms_test("or_d(or_i(multi(2,A,B,C),0),c:pk_h(D))", "dBesu"); @@ -22029,7 +22029,7 @@ mod tests { ms_test("or_d(or_d(multi(2,A,B,C),or_d(j:multi(2,D,E,F),multi(2,G,I,J))),multi(2,K,L,M))", "dBesu"); ms_test("andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),and_b(multi(2,A,B,C),a:after(1)),multi(2,D,E,F))", "usdB"); ms_test("or_d(or_d(j:multi(2,A,B,C),multi(2,D,E,F)),c:pk_k(G))", "dBesu"); - ms_test("andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),dv:after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C),0)", "usdB"); + ms_test("andor(andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),ndv:after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b)),multi(2,A,B,C),0)", "usdB"); ms_test("and_v(v:andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),and_v(vn:after(1),sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b))),multi(2,A,B,C))", "usB"); ms_test("andor(c:andor(j:multi(2,A,B,C),pk_h(D),pk_h(E)),after(500000001),0)", "esdB"); ms_test("andor(multi(2,A,B,C),after(1),andor(sha256(c7bcb868ab4db55ca45f8eefe5b1677d9fc2c4111e295baaee1b34ed352c719b),multi(2,D,E,F),multi(2,G,I,J)))", "sdB"); @@ -22282,7 +22282,7 @@ mod tests { ms_test("and_b(n:after(1),a:and_b(after(500000001),a:multi(2,A,B,C)))","Busm"); ms_test("and_b(and_b(after(1),a:multi(2,A,B,C)),a:after(500000001))","Busm"); ms_test("and_b(c:pk_h(A),a:and_b(after(1),a:after(500000001)))","Bunsm"); - ms_test("c:and_v(v:andor(multi(2,A,B,C),jdv:after(1),after(500000001)),pk_h(D))","Busm"); + ms_test("c:and_v(v:andor(multi(2,A,B,C),njdv:after(1),after(500000001)),pk_h(D))","Busm"); ms_test("and_v(v:multi(2,A,B,C),and_v(v:after(1),after(500000001)))","Bnsfm"); ms_test("and_b(c:pk_h(A),a:and_b(after(500000001),a:after(1)))","Bunsm"); ms_test("and_b(after(1),a:and_b(multi(2,A,B,C),a:after(500000001)))","Busm"); @@ -22554,7 +22554,7 @@ mod tests { ms_test("and_v(v:and_v(v:after(1),multi(2,A,B,C)),n:after(500000001))","unfBsm"); ms_test("andor(multi(2,A,B,C),and_v(v:after(1),after(500000001)),multi(2,D,E,F))","Bedsm"); ms_test("and_v(v:and_v(v:multi(2,A,B,C),n:after(1)),after(500000001))","Bnsfm"); - ms_test("and_b(multi(2,A,B,C),a:and_b(dv:after(500000001),a:after(1)))","Bunsm"); + ms_test("and_b(multi(2,A,B,C),a:and_b(ndv:after(500000001),a:after(1)))","Bunsm"); ms_test("and_b(after(500000001),a:and_b(n:after(1),a:multi(2,A,B,C)))","Busm"); ms_test("andor(n:andor(multi(2,A,B,C),after(500000001),multi(2,D,E,F)),after(1),multi(2,G,I,J))","Bedsm"); ms_test("andor(n:andor(multi(2,A,B,C),after(1),multi(2,D,E,F)),after(500000001),multi(2,G,I,J))","Bedsm"); @@ -23658,7 +23658,7 @@ mod tests { ms_test("and_v(v:and_v(v:after(1),c:pk_h(A)),after(500000001))","Bnsfm"); ms_test("and_v(or_c(multi(2,A,B,C),v:after(1)),and_b(after(500000001),a:multi(2,D,E,F)))","Busm"); ms_test("andor(multi(2,A,B,C),and_b(after(1),a:after(500000001)),multi(2,D,E,F))","ueBdsm"); - ms_test("and_b(andor(multi(2,A,B,C),after(500000001),dv:after(1)),a:multi(2,D,E,F))","Budsm"); + ms_test("and_b(andor(multi(2,A,B,C),after(500000001),ndv:after(1)),a:multi(2,D,E,F))","Budsm"); ms_test("and_b(after(1),a:and_b(after(500000001),ac:pk_k(A)))","Busm"); ms_test("andor(multi(2,A,B,C),andor(c:pk_h(D),after(1),after(500000001)),multi(2,E,F,G))","Bedsm"); ms_test("and_b(c:pk_h(A),a:and_b(after(1),a:after(500000001)))","Bunsm"); diff --git a/src/miniscript/types/correctness.rs b/src/miniscript/types/correctness.rs index 9164e42a7..0ee507234 100644 --- a/src/miniscript/types/correctness.rs +++ b/src/miniscript/types/correctness.rs @@ -241,7 +241,7 @@ impl Property for Correctness { _ => return Err(ErrorKind::NonZeroDupIf), }, dissatisfiable: true, - unit: true, + unit: false, }) } @@ -474,15 +474,19 @@ impl Property for Correctness { }) } - fn threshold(k: usize, n: usize, mut sub_ck: S) -> Result + fn threshold(_k: usize, n: usize, mut sub_ck: S) -> Result where S: FnMut(usize) -> Result, { - let mut is_n = k == n; + let mut num_args = 0; for i in 0..n { let subtype = sub_ck(i)?; + num_args += match subtype.input { + Input::Zero => 0, + Input::One | Input::OneNonZero => 1, + Input::Any | Input::AnyNonZero => 2, // we only check if num args is max 1 + }; if i == 0 { - is_n &= subtype.input == Input::OneNonZero || subtype.input == Input::AnyNonZero; if subtype.base != Base::B { return Err(ErrorKind::ThresholdBase(i, subtype.base)); } @@ -501,7 +505,11 @@ impl Property for Correctness { Ok(Correctness { base: Base::B, - input: if is_n { Input::AnyNonZero } else { Input::Any }, + input: match num_args { + 0 => Input::Zero, + 1 => Input::One, + _ => Input::Any, + }, dissatisfiable: true, unit: true, }) diff --git a/src/miniscript/types/extra_props.rs b/src/miniscript/types/extra_props.rs index 735c429f3..621788244 100644 --- a/src/miniscript/types/extra_props.rs +++ b/src/miniscript/types/extra_props.rs @@ -678,7 +678,7 @@ impl Property for ExtData { } fn or_d(l: Self, r: Self) -> Result { - Ok(ExtData { + let res = ExtData { pk_cost: l.pk_cost + r.pk_cost + 3, has_free_verify: false, ops_count_static: l.ops_count_static + r.ops_count_static + 1, @@ -708,14 +708,15 @@ impl Property for ExtData { .and_then(|(lw, ls)| r.max_dissat_size.map(|(rw, rs)| (lw + rw, ls + rs))), timelock_info: TimeLockInfo::comb_or_timelocks(l.timelock_info, r.timelock_info), exec_stack_elem_count_sat: cmp::max( - opt_max(l.exec_stack_elem_count_sat, r.exec_stack_elem_count_dissat), - r.exec_stack_elem_count_sat, + l.exec_stack_elem_count_sat, + opt_max(r.exec_stack_elem_count_sat, l.exec_stack_elem_count_dissat), ), exec_stack_elem_count_dissat: opt_max( l.exec_stack_elem_count_dissat, r.exec_stack_elem_count_dissat.map(|x| x + 1), ), - }) + }; + Ok(res) } fn or_c(l: Self, r: Self) -> Result { @@ -743,8 +744,8 @@ impl Property for ExtData { max_dissat_size: None, timelock_info: TimeLockInfo::comb_or_timelocks(l.timelock_info, r.timelock_info), exec_stack_elem_count_sat: cmp::max( - opt_max(l.exec_stack_elem_count_sat, r.exec_stack_elem_count_dissat), - r.exec_stack_elem_count_sat, + l.exec_stack_elem_count_sat, + opt_max(r.exec_stack_elem_count_sat, l.exec_stack_elem_count_dissat), ), exec_stack_elem_count_dissat: None, }) diff --git a/src/miniscript/types/malleability.rs b/src/miniscript/types/malleability.rs index ebef4c114..567297767 100644 --- a/src/miniscript/types/malleability.rs +++ b/src/miniscript/types/malleability.rs @@ -317,15 +317,13 @@ impl Property for Malleability { all_are_non_malleable &= subtype.non_malleable; } Ok(Malleability { - dissat: if all_are_dissat_unique && (k == 1 || safe_count == n) { + dissat: if all_are_dissat_unique && safe_count == n { Dissat::Unique } else { Dissat::Unknown }, safe: safe_count > n - k, - non_malleable: all_are_non_malleable - && safe_count >= n - k - && (k == n || all_are_dissat_unique), + non_malleable: all_are_non_malleable && safe_count >= n - k && all_are_dissat_unique, }) } } diff --git a/src/policy/compiler.rs b/src/policy/compiler.rs index 6cb4ed22d..384713c35 100644 --- a/src/policy/compiler.rs +++ b/src/policy/compiler.rs @@ -1166,13 +1166,13 @@ mod tests { use std::str::FromStr; use std::string::String; - use miniscript::{satisfy, Legacy, Segwitv0}; + use miniscript::{satisfy, Legacy, Segwitv0, Tap}; use policy::Liftable; use script_num_size; type SPolicy = Concrete; type BPolicy = Concrete; - type DummySegwitAstElemExt = policy::compiler::AstElemExt; + type DummyTapAstElemExt = policy::compiler::AstElemExt; type SegwitMiniScript = Miniscript; fn pubkeys_and_a_sig(n: usize) -> (Vec, secp256k1::ecdsa::Signature) { @@ -1262,7 +1262,7 @@ mod tests { #[test] fn compile_q() { let policy = SPolicy::from_str("or(1@and(pk(A),pk(B)),127@pk(C))").expect("parsing"); - let compilation: DummySegwitAstElemExt = + let compilation: DummyTapAstElemExt = best_t(&mut BTreeMap::new(), &policy, 1.0, None).unwrap(); assert_eq!(compilation.cost_1d(1.0, None), 88.0 + 74.109375); @@ -1271,13 +1271,14 @@ mod tests { compilation.ms.lift().unwrap().sorted() ); + // compile into taproot context to avoid limit errors let policy = SPolicy::from_str( "and(and(and(or(127@thresh(2,pk(A),pk(B),thresh(2,or(127@pk(A),1@pk(B)),after(100),or(and(pk(C),after(200)),and(pk(D),sha256(66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925))),pk(E))),1@pk(F)),sha256(66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925)),or(127@pk(G),1@after(300))),or(127@after(400),pk(H)))" ).expect("parsing"); - let compilation: DummySegwitAstElemExt = + let compilation: DummyTapAstElemExt = best_t(&mut BTreeMap::new(), &policy, 1.0, None).unwrap(); - assert_eq!(compilation.cost_1d(1.0, None), 437.0 + 299.4003295898438); + assert_eq!(compilation.cost_1d(1.0, None), 438.0 + 299.4003295898438); assert_eq!( policy.lift().unwrap().sorted(), compilation.ms.lift().unwrap().sorted() @@ -1563,9 +1564,9 @@ mod benches { use test::{black_box, Bencher}; use super::{CompilerError, Concrete}; - use miniscript::Segwitv0; + use miniscript::Tap; use Miniscript; - type SegwitMsRes = Result, CompilerError>; + type TapMsRes = Result, CompilerError>; #[bench] pub fn compile_basic(bh: &mut Bencher) { let h = (0..64).map(|_| "a").collect::(); @@ -1575,7 +1576,7 @@ mod benches { )) .expect("parsing"); bh.iter(|| { - let pt: SegwitMsRes = pol.compile(); + let pt: TapMsRes = pol.compile(); black_box(pt).unwrap(); }); } @@ -1587,7 +1588,7 @@ mod benches { &format!("or(pk(L),thresh(9,sha256({}),pk(A),pk(B),and(or(pk(C),pk(D)),pk(E)),after(100),pk(F),pk(G),pk(H),pk(I),and(pk(J),pk(K))))", h) ).expect("parsing"); bh.iter(|| { - let pt: SegwitMsRes = pol.compile(); + let pt: TapMsRes = pol.compile(); black_box(pt).unwrap(); }); } @@ -1598,7 +1599,7 @@ mod benches { "or(pk(A),thresh(4,pk(B),older(100),pk(C),and(after(100),or(pk(D),or(pk(E),and(pk(F),thresh(2,pk(G),or(pk(H),and(thresh(5,pk(I),or(pk(J),pk(K)),pk(L),pk(M),pk(N),pk(O),pk(P),pk(Q),pk(R),pk(S),pk(T)),pk(U))),pk(V),or(and(pk(W),pk(X)),pk(Y)),after(100)))))),pk(Z)))" ).expect("parsing"); bh.iter(|| { - let pt: SegwitMsRes = pol.compile(); + let pt: TapMsRes = pol.compile(); black_box(pt).unwrap(); }); }