Skip to content

Commit

Permalink
Fixed some broken test vectors and updated test scenarios (some vecto…
Browse files Browse the repository at this point in the history
…rs still wrong)
  • Loading branch information
chiguireitor committed Feb 7, 2021
1 parent 37a5582 commit 0ecc0ef
Show file tree
Hide file tree
Showing 9 changed files with 126 additions and 25 deletions.
16 changes: 14 additions & 2 deletions counterpartylib/test/fixtures/scenarios/multisig_1_of_2.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PRAGMA page_size=4096;
-- PRAGMA page_size=1024;
-- PRAGMA encoding='UTF-8';
-- PRAGMA auto_vacuum=NONE;
-- PRAGMA max_page_count=1073741823;
Expand Down Expand Up @@ -591,7 +591,19 @@ CREATE TABLE dispenses(
destination TEXT,
asset TEXT,
dispense_quantity INTEGER,
PRIMARY KEY (tx_index, dispense_index, source, destination));
dispenser_tx_hash TEXT,
PRIMARY KEY (tx_index, dispense_index, source, destination),
FOREIGN KEY (tx_index, tx_hash, block_index) REFERENCES transactions(tx_index, tx_hash, block_index));
-- Triggers and indices on dispenses
CREATE TRIGGER _dispenses_delete BEFORE DELETE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'INSERT INTO dispenses(rowid,tx_index,dispense_index,tx_hash,block_index,source,destination,asset,dispense_quantity,dispenser_tx_hash) VALUES('||old.rowid||','||quote(old.tx_index)||','||quote(old.dispense_index)||','||quote(old.tx_hash)||','||quote(old.block_index)||','||quote(old.source)||','||quote(old.destination)||','||quote(old.asset)||','||quote(old.dispense_quantity)||','||quote(old.dispenser_tx_hash)||')');
END;
CREATE TRIGGER _dispenses_insert AFTER INSERT ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'DELETE FROM dispenses WHERE rowid='||new.rowid);
END;
CREATE TRIGGER _dispenses_update AFTER UPDATE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'UPDATE dispenses SET tx_index='||quote(old.tx_index)||',dispense_index='||quote(old.dispense_index)||',tx_hash='||quote(old.tx_hash)||',block_index='||quote(old.block_index)||',source='||quote(old.source)||',destination='||quote(old.destination)||',asset='||quote(old.asset)||',dispense_quantity='||quote(old.dispense_quantity)||',dispenser_tx_hash='||quote(old.dispenser_tx_hash)||' WHERE rowid='||old.rowid);
END;

-- Table dividends
DROP TABLE IF EXISTS dividends;
Expand Down
16 changes: 14 additions & 2 deletions counterpartylib/test/fixtures/scenarios/multisig_1_of_3.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PRAGMA page_size=4096;
-- PRAGMA page_size=1024;
-- PRAGMA encoding='UTF-8';
-- PRAGMA auto_vacuum=NONE;
-- PRAGMA max_page_count=1073741823;
Expand Down Expand Up @@ -591,7 +591,19 @@ CREATE TABLE dispenses(
destination TEXT,
asset TEXT,
dispense_quantity INTEGER,
PRIMARY KEY (tx_index, dispense_index, source, destination));
dispenser_tx_hash TEXT,
PRIMARY KEY (tx_index, dispense_index, source, destination),
FOREIGN KEY (tx_index, tx_hash, block_index) REFERENCES transactions(tx_index, tx_hash, block_index));
-- Triggers and indices on dispenses
CREATE TRIGGER _dispenses_delete BEFORE DELETE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'INSERT INTO dispenses(rowid,tx_index,dispense_index,tx_hash,block_index,source,destination,asset,dispense_quantity,dispenser_tx_hash) VALUES('||old.rowid||','||quote(old.tx_index)||','||quote(old.dispense_index)||','||quote(old.tx_hash)||','||quote(old.block_index)||','||quote(old.source)||','||quote(old.destination)||','||quote(old.asset)||','||quote(old.dispense_quantity)||','||quote(old.dispenser_tx_hash)||')');
END;
CREATE TRIGGER _dispenses_insert AFTER INSERT ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'DELETE FROM dispenses WHERE rowid='||new.rowid);
END;
CREATE TRIGGER _dispenses_update AFTER UPDATE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'UPDATE dispenses SET tx_index='||quote(old.tx_index)||',dispense_index='||quote(old.dispense_index)||',tx_hash='||quote(old.tx_hash)||',block_index='||quote(old.block_index)||',source='||quote(old.source)||',destination='||quote(old.destination)||',asset='||quote(old.asset)||',dispense_quantity='||quote(old.dispense_quantity)||',dispenser_tx_hash='||quote(old.dispenser_tx_hash)||' WHERE rowid='||old.rowid);
END;

-- Table dividends
DROP TABLE IF EXISTS dividends;
Expand Down
16 changes: 14 additions & 2 deletions counterpartylib/test/fixtures/scenarios/multisig_2_of_2.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PRAGMA page_size=4096;
-- PRAGMA page_size=1024;
-- PRAGMA encoding='UTF-8';
-- PRAGMA auto_vacuum=NONE;
-- PRAGMA max_page_count=1073741823;
Expand Down Expand Up @@ -591,7 +591,19 @@ CREATE TABLE dispenses(
destination TEXT,
asset TEXT,
dispense_quantity INTEGER,
PRIMARY KEY (tx_index, dispense_index, source, destination));
dispenser_tx_hash TEXT,
PRIMARY KEY (tx_index, dispense_index, source, destination),
FOREIGN KEY (tx_index, tx_hash, block_index) REFERENCES transactions(tx_index, tx_hash, block_index));
-- Triggers and indices on dispenses
CREATE TRIGGER _dispenses_delete BEFORE DELETE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'INSERT INTO dispenses(rowid,tx_index,dispense_index,tx_hash,block_index,source,destination,asset,dispense_quantity,dispenser_tx_hash) VALUES('||old.rowid||','||quote(old.tx_index)||','||quote(old.dispense_index)||','||quote(old.tx_hash)||','||quote(old.block_index)||','||quote(old.source)||','||quote(old.destination)||','||quote(old.asset)||','||quote(old.dispense_quantity)||','||quote(old.dispenser_tx_hash)||')');
END;
CREATE TRIGGER _dispenses_insert AFTER INSERT ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'DELETE FROM dispenses WHERE rowid='||new.rowid);
END;
CREATE TRIGGER _dispenses_update AFTER UPDATE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'UPDATE dispenses SET tx_index='||quote(old.tx_index)||',dispense_index='||quote(old.dispense_index)||',tx_hash='||quote(old.tx_hash)||',block_index='||quote(old.block_index)||',source='||quote(old.source)||',destination='||quote(old.destination)||',asset='||quote(old.asset)||',dispense_quantity='||quote(old.dispense_quantity)||',dispenser_tx_hash='||quote(old.dispenser_tx_hash)||' WHERE rowid='||old.rowid);
END;

-- Table dividends
DROP TABLE IF EXISTS dividends;
Expand Down
16 changes: 14 additions & 2 deletions counterpartylib/test/fixtures/scenarios/multisig_2_of_3.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PRAGMA page_size=4096;
-- PRAGMA page_size=1024;
-- PRAGMA encoding='UTF-8';
-- PRAGMA auto_vacuum=NONE;
-- PRAGMA max_page_count=1073741823;
Expand Down Expand Up @@ -591,7 +591,19 @@ CREATE TABLE dispenses(
destination TEXT,
asset TEXT,
dispense_quantity INTEGER,
PRIMARY KEY (tx_index, dispense_index, source, destination));
dispenser_tx_hash TEXT,
PRIMARY KEY (tx_index, dispense_index, source, destination),
FOREIGN KEY (tx_index, tx_hash, block_index) REFERENCES transactions(tx_index, tx_hash, block_index));
-- Triggers and indices on dispenses
CREATE TRIGGER _dispenses_delete BEFORE DELETE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'INSERT INTO dispenses(rowid,tx_index,dispense_index,tx_hash,block_index,source,destination,asset,dispense_quantity,dispenser_tx_hash) VALUES('||old.rowid||','||quote(old.tx_index)||','||quote(old.dispense_index)||','||quote(old.tx_hash)||','||quote(old.block_index)||','||quote(old.source)||','||quote(old.destination)||','||quote(old.asset)||','||quote(old.dispense_quantity)||','||quote(old.dispenser_tx_hash)||')');
END;
CREATE TRIGGER _dispenses_insert AFTER INSERT ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'DELETE FROM dispenses WHERE rowid='||new.rowid);
END;
CREATE TRIGGER _dispenses_update AFTER UPDATE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'UPDATE dispenses SET tx_index='||quote(old.tx_index)||',dispense_index='||quote(old.dispense_index)||',tx_hash='||quote(old.tx_hash)||',block_index='||quote(old.block_index)||',source='||quote(old.source)||',destination='||quote(old.destination)||',asset='||quote(old.asset)||',dispense_quantity='||quote(old.dispense_quantity)||',dispenser_tx_hash='||quote(old.dispenser_tx_hash)||' WHERE rowid='||old.rowid);
END;

-- Table dividends
DROP TABLE IF EXISTS dividends;
Expand Down
16 changes: 14 additions & 2 deletions counterpartylib/test/fixtures/scenarios/multisig_3_of_3.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PRAGMA page_size=4096;
-- PRAGMA page_size=1024;
-- PRAGMA encoding='UTF-8';
-- PRAGMA auto_vacuum=NONE;
-- PRAGMA max_page_count=1073741823;
Expand Down Expand Up @@ -591,7 +591,19 @@ CREATE TABLE dispenses(
destination TEXT,
asset TEXT,
dispense_quantity INTEGER,
PRIMARY KEY (tx_index, dispense_index, source, destination));
dispenser_tx_hash TEXT,
PRIMARY KEY (tx_index, dispense_index, source, destination),
FOREIGN KEY (tx_index, tx_hash, block_index) REFERENCES transactions(tx_index, tx_hash, block_index));
-- Triggers and indices on dispenses
CREATE TRIGGER _dispenses_delete BEFORE DELETE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'INSERT INTO dispenses(rowid,tx_index,dispense_index,tx_hash,block_index,source,destination,asset,dispense_quantity,dispenser_tx_hash) VALUES('||old.rowid||','||quote(old.tx_index)||','||quote(old.dispense_index)||','||quote(old.tx_hash)||','||quote(old.block_index)||','||quote(old.source)||','||quote(old.destination)||','||quote(old.asset)||','||quote(old.dispense_quantity)||','||quote(old.dispenser_tx_hash)||')');
END;
CREATE TRIGGER _dispenses_insert AFTER INSERT ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'DELETE FROM dispenses WHERE rowid='||new.rowid);
END;
CREATE TRIGGER _dispenses_update AFTER UPDATE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'UPDATE dispenses SET tx_index='||quote(old.tx_index)||',dispense_index='||quote(old.dispense_index)||',tx_hash='||quote(old.tx_hash)||',block_index='||quote(old.block_index)||',source='||quote(old.source)||',destination='||quote(old.destination)||',asset='||quote(old.asset)||',dispense_quantity='||quote(old.dispense_quantity)||',dispenser_tx_hash='||quote(old.dispenser_tx_hash)||' WHERE rowid='||old.rowid);
END;

-- Table dividends
DROP TABLE IF EXISTS dividends;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PRAGMA page_size=4096;
-- PRAGMA page_size=1024;
-- PRAGMA encoding='UTF-8';
-- PRAGMA auto_vacuum=NONE;
-- PRAGMA max_page_count=1073741823;
Expand Down Expand Up @@ -1050,7 +1050,19 @@ CREATE TABLE dispenses(
destination TEXT,
asset TEXT,
dispense_quantity INTEGER,
PRIMARY KEY (tx_index, dispense_index, source, destination));
dispenser_tx_hash TEXT,
PRIMARY KEY (tx_index, dispense_index, source, destination),
FOREIGN KEY (tx_index, tx_hash, block_index) REFERENCES transactions(tx_index, tx_hash, block_index));
-- Triggers and indices on dispenses
CREATE TRIGGER _dispenses_delete BEFORE DELETE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'INSERT INTO dispenses(rowid,tx_index,dispense_index,tx_hash,block_index,source,destination,asset,dispense_quantity,dispenser_tx_hash) VALUES('||old.rowid||','||quote(old.tx_index)||','||quote(old.dispense_index)||','||quote(old.tx_hash)||','||quote(old.block_index)||','||quote(old.source)||','||quote(old.destination)||','||quote(old.asset)||','||quote(old.dispense_quantity)||','||quote(old.dispenser_tx_hash)||')');
END;
CREATE TRIGGER _dispenses_insert AFTER INSERT ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'DELETE FROM dispenses WHERE rowid='||new.rowid);
END;
CREATE TRIGGER _dispenses_update AFTER UPDATE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'UPDATE dispenses SET tx_index='||quote(old.tx_index)||',dispense_index='||quote(old.dispense_index)||',tx_hash='||quote(old.tx_hash)||',block_index='||quote(old.block_index)||',source='||quote(old.source)||',destination='||quote(old.destination)||',asset='||quote(old.asset)||',dispense_quantity='||quote(old.dispense_quantity)||',dispenser_tx_hash='||quote(old.dispenser_tx_hash)||' WHERE rowid='||old.rowid);
END;

-- Table dividends
DROP TABLE IF EXISTS dividends;
Expand Down
16 changes: 14 additions & 2 deletions counterpartylib/test/fixtures/scenarios/simplesig.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PRAGMA page_size=4096;
-- PRAGMA page_size=1024;
-- PRAGMA encoding='UTF-8';
-- PRAGMA auto_vacuum=NONE;
-- PRAGMA max_page_count=1073741823;
Expand Down Expand Up @@ -591,7 +591,19 @@ CREATE TABLE dispenses(
destination TEXT,
asset TEXT,
dispense_quantity INTEGER,
PRIMARY KEY (tx_index, dispense_index, source, destination));
dispenser_tx_hash TEXT,
PRIMARY KEY (tx_index, dispense_index, source, destination),
FOREIGN KEY (tx_index, tx_hash, block_index) REFERENCES transactions(tx_index, tx_hash, block_index));
-- Triggers and indices on dispenses
CREATE TRIGGER _dispenses_delete BEFORE DELETE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'INSERT INTO dispenses(rowid,tx_index,dispense_index,tx_hash,block_index,source,destination,asset,dispense_quantity,dispenser_tx_hash) VALUES('||old.rowid||','||quote(old.tx_index)||','||quote(old.dispense_index)||','||quote(old.tx_hash)||','||quote(old.block_index)||','||quote(old.source)||','||quote(old.destination)||','||quote(old.asset)||','||quote(old.dispense_quantity)||','||quote(old.dispenser_tx_hash)||')');
END;
CREATE TRIGGER _dispenses_insert AFTER INSERT ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'DELETE FROM dispenses WHERE rowid='||new.rowid);
END;
CREATE TRIGGER _dispenses_update AFTER UPDATE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'UPDATE dispenses SET tx_index='||quote(old.tx_index)||',dispense_index='||quote(old.dispense_index)||',tx_hash='||quote(old.tx_hash)||',block_index='||quote(old.block_index)||',source='||quote(old.source)||',destination='||quote(old.destination)||',asset='||quote(old.asset)||',dispense_quantity='||quote(old.dispense_quantity)||',dispenser_tx_hash='||quote(old.dispenser_tx_hash)||' WHERE rowid='||old.rowid);
END;

-- Table dividends
DROP TABLE IF EXISTS dividends;
Expand Down
16 changes: 14 additions & 2 deletions counterpartylib/test/fixtures/scenarios/unittest_fixture.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PRAGMA page_size=4096;
-- PRAGMA page_size=1024;
-- PRAGMA encoding='UTF-8';
-- PRAGMA auto_vacuum=NONE;
-- PRAGMA max_page_count=1073741823;
Expand Down Expand Up @@ -1049,7 +1049,19 @@ CREATE TABLE dispenses(
destination TEXT,
asset TEXT,
dispense_quantity INTEGER,
PRIMARY KEY (tx_index, dispense_index, source, destination));
dispenser_tx_hash TEXT,
PRIMARY KEY (tx_index, dispense_index, source, destination),
FOREIGN KEY (tx_index, tx_hash, block_index) REFERENCES transactions(tx_index, tx_hash, block_index));
-- Triggers and indices on dispenses
CREATE TRIGGER _dispenses_delete BEFORE DELETE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'INSERT INTO dispenses(rowid,tx_index,dispense_index,tx_hash,block_index,source,destination,asset,dispense_quantity,dispenser_tx_hash) VALUES('||old.rowid||','||quote(old.tx_index)||','||quote(old.dispense_index)||','||quote(old.tx_hash)||','||quote(old.block_index)||','||quote(old.source)||','||quote(old.destination)||','||quote(old.asset)||','||quote(old.dispense_quantity)||','||quote(old.dispenser_tx_hash)||')');
END;
CREATE TRIGGER _dispenses_insert AFTER INSERT ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'DELETE FROM dispenses WHERE rowid='||new.rowid);
END;
CREATE TRIGGER _dispenses_update AFTER UPDATE ON dispenses BEGIN
INSERT INTO undolog VALUES(NULL, 'UPDATE dispenses SET tx_index='||quote(old.tx_index)||',dispense_index='||quote(old.dispense_index)||',tx_hash='||quote(old.tx_hash)||',block_index='||quote(old.block_index)||',source='||quote(old.source)||',destination='||quote(old.destination)||',asset='||quote(old.asset)||',dispense_quantity='||quote(old.dispense_quantity)||',dispenser_tx_hash='||quote(old.dispenser_tx_hash)||' WHERE rowid='||old.rowid);
END;

-- Table dividends
DROP TABLE IF EXISTS dividends;
Expand Down
23 changes: 14 additions & 9 deletions counterpartylib/test/fixtures/vectors.py
Original file line number Diff line number Diff line change
Expand Up @@ -1127,24 +1127,29 @@
}],
'pack': [{
'in': ('XCP', 1, bytes(9999999)),
'out': b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00'
}],
'unpack': [{
'in': (b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00',),
'error': (exceptions.UnpackError, 'could not unpack')
'out': b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
}],
#'unpack': [{
# 'in': (b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00',),
# 'error': (exceptions.UnpackError, 'could not unpack')
#}],
'compose': [{
'in': (ADDR[0], 'XCP', 1, bytes(9999999)),
'out': (ADDR[0], [], b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00')
#'out': (ADDR[0], [], b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00')
'out': (ADDR[0], [], b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
}, {
'in': (ADDR[0], 'XCP', 1, b'WASTE'),
'out': (ADDR[0], [], b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01WASTE\x00\x00\x00')
#'out': (ADDR[0], [], b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01WASTE\x00\x00\x00')
'out': (ADDR[0], [], b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01WASTE')
}, {
'in': (ADDR[0], 'XCP', 1, b'WASTEEEEE'),
'out': (ADDR[0], [], b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01WASTEEEE')
#'out': (ADDR[0], [], b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01WASTEEEE'),
'out': (ADDR[0], [], b'\x00\x00\x00n\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x01WASTEEEEE')
}, {
'in': (ADDR[0], 'PARENT.already.issued', 1, b'WASTEEEEE'),
'out': (ADDR[0], [], bytes.fromhex('0000006e01530821671b106500000000000000015741535445454545'))
#'out': (ADDR[0], [], bytes.fromhex('0000006e01530821671b106500000000000000015741535445454545'))
'out': (ADDR[0], [], b'\x00\x00\x00n\x01S\x08!g\x1b\x10e\x00\x00\x00\x00\x00\x00\x00\x01WASTEEEEE')

}],
'parse': [{
'in': ({'tx_hash': 'db6d9052b576d973196363e11163d492f50926c2f1d1efd67b3d999817b0d04d',
Expand Down

0 comments on commit 0ecc0ef

Please sign in to comment.