From 58cb857b9fb2135caded3ea3c5c76c9624d6f60b Mon Sep 17 00:00:00 2001
From: zhangsoledad <787953403@qq.com>
Date: Wed, 26 Dec 2018 15:31:44 +0800
Subject: [PATCH] refactor: rename ambiguous tx error

Revert "refactor: rename Cellbase -> CellBase"

This reverts commit 8de3ae7b07e0894bcdeb133b65cbbd1f4ce9af36.
---
 verification/src/error.rs                      | 6 ++++--
 verification/src/tests/transaction_verifier.rs | 7 +++++--
 verification/src/transaction_verifier.rs       | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/verification/src/error.rs b/verification/src/error.rs
index 078ad2c107..f27a149f28 100644
--- a/verification/src/error.rs
+++ b/verification/src/error.rs
@@ -114,10 +114,12 @@ pub enum DifficultyError {
 #[derive(Debug, PartialEq, Clone, Copy, Eq)]
 pub enum TransactionError {
     NullInput,
-    OutOfBound,
+    /// Occur output's bytes_len exceed capacity
+    CapacityOverflow,
     DuplicateInputs,
     Empty,
-    InvalidCapacity,
+    /// Sum of all outputs capacity exceed sum of all inputs in the transaction
+    OutputsSumOverflow,
     InvalidScript,
     ScriptFailure(ScriptError),
     InvalidSignature,
diff --git a/verification/src/tests/transaction_verifier.rs b/verification/src/tests/transaction_verifier.rs
index 4b2880ee71..233ad05ed1 100644
--- a/verification/src/tests/transaction_verifier.rs
+++ b/verification/src/tests/transaction_verifier.rs
@@ -45,7 +45,10 @@ pub fn test_capacity_outofbound() {
     };
     let verifier = CapacityVerifier::new(&rtx);
 
-    assert_eq!(verifier.verify().err(), Some(TransactionError::OutOfBound));
+    assert_eq!(
+        verifier.verify().err(),
+        Some(TransactionError::CapacityOverflow)
+    );
 }
 
 #[test]
@@ -69,7 +72,7 @@ pub fn test_capacity_invalid() {
 
     assert_eq!(
         verifier.verify().err(),
-        Some(TransactionError::InvalidCapacity)
+        Some(TransactionError::OutputsSumOverflow)
     );
 }
 
diff --git a/verification/src/transaction_verifier.rs b/verification/src/transaction_verifier.rs
index 57da135726..18244a4ed5 100644
--- a/verification/src/transaction_verifier.rs
+++ b/verification/src/transaction_verifier.rs
@@ -184,7 +184,7 @@ impl<'a> CapacityVerifier<'a> {
             .fold(0, |acc, output| acc + output.capacity);
 
         if inputs_total < outputs_total {
-            Err(TransactionError::InvalidCapacity)
+            Err(TransactionError::OutputsSumOverflow)
         } else if self
             .resolved_transaction
             .transaction
@@ -192,7 +192,7 @@ impl<'a> CapacityVerifier<'a> {
             .iter()
             .any(|output| output.bytes_len() as Capacity > output.capacity)
         {
-            Err(TransactionError::OutOfBound)
+            Err(TransactionError::CapacityOverflow)
         } else {
             Ok(())
         }