Skip to content
Snippets Groups Projects
Commit 427f93bd authored by Éloïs's avatar Éloïs
Browse files

[fix] bc: temporary skip check user docs sig due to #183

parent 998337e4
No related branches found
No related tags found
1 merge request!235Elois/engine
...@@ -26,7 +26,7 @@ use self::tx_doc::TransactionDocumentError; ...@@ -26,7 +26,7 @@ use self::tx_doc::TransactionDocumentError;
use dubp_block_doc::block::v10::BlockDocumentV10; use dubp_block_doc::block::v10::BlockDocumentV10;
use dubp_block_doc::{block::BlockDocumentTrait, BlockDocument}; use dubp_block_doc::{block::BlockDocumentTrait, BlockDocument};
use dubp_common_doc::errors::DocumentSigsErr; use dubp_common_doc::errors::DocumentSigsErr;
use dubp_common_doc::traits::Document; //use dubp_common_doc::traits::Document;
use dubp_common_doc::BlockNumber; use dubp_common_doc::BlockNumber;
use dubp_currency_params::CurrencyParameters; use dubp_currency_params::CurrencyParameters;
...@@ -45,13 +45,13 @@ pub enum LocalVerifyBlockError { ...@@ -45,13 +45,13 @@ pub enum LocalVerifyBlockError {
/// Signature error /// Signature error
_BlockSignatureError(DocumentSigsErr), _BlockSignatureError(DocumentSigsErr),
/// Identity signature error /// Identity signature error
IdentitySignatureError(DocumentSigsErr), _IdentitySignatureError(DocumentSigsErr),
/// Joiner signature error /// Joiner signature error
JoinerSignatureError(DocumentSigsErr), _JoinerSignatureError(DocumentSigsErr),
/// Active signature error /// Active signature error
ActiveSignatureError(DocumentSigsErr), _ActiveSignatureError(DocumentSigsErr),
/// Leaver signature error /// Leaver signature error
LeaverSignatureError(DocumentSigsErr), _LeaverSignatureError(DocumentSigsErr),
/// Missing issuer /// Missing issuer
MissingIssuer, MissingIssuer,
/// Too many issuers (> 1) /// Too many issuers (> 1)
...@@ -123,10 +123,10 @@ pub fn verify_local_validity_block_v10( ...@@ -123,10 +123,10 @@ pub fn verify_local_validity_block_v10(
// As it has been checked that block.issuers.len() == 1 and as // As it has been checked that block.issuers.len() == 1 and as
// block.issuers.len() == block.signatures.len() is check in block.verify_signatures() // block.issuers.len() == block.signatures.len() is check in block.verify_signatures()
// there is no need to check that block.signatures.len() == 1 // there is no need to check that block.signatures.len() == 1
// check bloc sig tmp disabled because #183 // Temporary disabled due to #183
/*block /*block
.verify_signatures() .verify_signatures()
.map_err(LocalVerifyBlockError::BlockSignatureError)?;*/ .map_err(LocalVerifyBlockError::BlockSignatureError)?;
for identity in &block.identities { for identity in &block.identities {
identity identity
.verify_signatures() .verify_signatures()
...@@ -146,7 +146,7 @@ pub fn verify_local_validity_block_v10( ...@@ -146,7 +146,7 @@ pub fn verify_local_validity_block_v10(
leaver leaver
.verify_signatures() .verify_signatures()
.map_err(LocalVerifyBlockError::LeaverSignatureError)?; .map_err(LocalVerifyBlockError::LeaverSignatureError)?;
} }*/
// Check transactions // Check transactions
for tx in &block.transactions { for tx in &block.transactions {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
use dubp_common_doc::errors::DocumentSigsErr; use dubp_common_doc::errors::DocumentSigsErr;
use dubp_common_doc::traits::text::CompactTextDocument; use dubp_common_doc::traits::text::CompactTextDocument;
use dubp_common_doc::traits::Document; //use dubp_common_doc::traits::Document;
use dubp_user_docs::documents::transaction::TransactionDocument; use dubp_user_docs::documents::transaction::TransactionDocument;
use durs_common_tools::traits::bool_ext::BoolExt; use durs_common_tools::traits::bool_ext::BoolExt;
...@@ -32,7 +32,7 @@ pub enum TransactionDocumentError { ...@@ -32,7 +32,7 @@ pub enum TransactionDocumentError {
/// There is no input /// There is no input
MissingInput, MissingInput,
/// Signature error /// Signature error
TxSignatureError(DocumentSigsErr), _TxSignatureError(DocumentSigsErr),
} }
/// Local verification of a Tx Document /// Local verification of a Tx Document
...@@ -46,23 +46,15 @@ pub fn local_verify_tx_doc(tx_doc: &TransactionDocument) -> Result<(), Transacti ...@@ -46,23 +46,15 @@ pub fn local_verify_tx_doc(tx_doc: &TransactionDocument) -> Result<(), Transacti
// A transaction must have at least 1 input // A transaction must have at least 1 input
(tx_doc.get_inputs().is_empty().not()).or_err(TransactionDocumentError::MissingInput)?; (tx_doc.get_inputs().is_empty().not()).or_err(TransactionDocumentError::MissingInput)?;
// A transaction cannot have `SIG(INDEX)` unlocks with `INDEX >= ` issuers count.
// Question : règle à pas vérifier
/*if y.get_unlocks().len() >= y.issuers().len() {
return Err(TransactionDocumentError(SignatureIssuerError));
}*/
// Signatures count must be the same as issuers count
// It's alreeady checked by `tx_doc.verify_signatures()`
//////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////
// A transaction **must** have signatures matching its content **for each issuer** // A transaction **must** have signatures matching its content **for each issuer**
// Signatures are ordered by issuer // Signatures are ordered by issuer
// Signatures are made over the transaction's content, signatures excepted // Signatures are made over the transaction's content, signatures excepted
//////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////
tx_doc // Temporary disabled due to #183
/*tx_doc
.verify_signatures() .verify_signatures()
.map_err(TransactionDocumentError::TxSignatureError)?; .map_err(TransactionDocumentError::TxSignatureError)?;*/
Ok(()) Ok(())
} }
...@@ -195,7 +187,7 @@ mod tests { ...@@ -195,7 +187,7 @@ mod tests {
assert_eq!(expected, actual); assert_eq!(expected, actual);
} }
#[test] /*#[test]
fn test_tx_invalid_sig() { fn test_tx_invalid_sig() {
let blockstamp = blockstamp(); let blockstamp = blockstamp();
let issuers = issuers(); let issuers = issuers();
...@@ -212,5 +204,5 @@ mod tests { ...@@ -212,5 +204,5 @@ mod tests {
)); ));
let actual = local_verify_tx_doc(&tx); let actual = local_verify_tx_doc(&tx);
assert_eq!(expected, actual); assert_eq!(expected, actual);
} }*/
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment