R4R: unify error code and improve unittests (#18)

* improve tokenhub test * unify error code and fix failed unittests * add oracle sequence * modify miniToken checker
bnb-chain · Jul 3, 2020 · b47863a · b47863a
1 parent 3bb7ad3
commit b47863a
Show file tree

Hide file tree

Showing 26 changed files with 1,163 additions and 700 deletions.
diff --git a/abi/bscvalidatorset.abi b/abi/bscvalidatorset.abi
@@ -152,6 +152,25 @@
 		"name": "systemTransfer",
 		"type": "event"
 	},
+	{
+		"anonymous": false,
+		"inputs": [
+			{
+				"indexed": false,
+				"internalType": "uint8",
+				"name": "channelId",
+				"type": "uint8"
+			},
+			{
+				"indexed": false,
+				"internalType": "bytes",
+				"name": "msgBytes",
+				"type": "bytes"
+			}
+		],
+		"name": "unexpectedPackage",
+		"type": "event"
+	},
 	{
 		"anonymous": false,
 		"inputs": [
@@ -376,6 +395,21 @@
 		"stateMutability": "view",
 		"type": "function"
 	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "EXPIRE_TIME_SECOND_GAP",
+		"outputs": [
+			{
+				"internalType": "uint256",
+				"name": "",
+				"type": "uint256"
+			}
+		],
+		"payable": false,
+		"stateMutability": "view",
+		"type": "function"
+	},
 	{
 		"constant": true,
 		"inputs": [],
@@ -466,6 +500,21 @@
 		"stateMutability": "view",
 		"type": "function"
 	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "PRECISION",
+		"outputs": [
+			{
+				"internalType": "uint256",
+				"name": "",
+				"type": "uint256"
+			}
+		],
+		"payable": false,
+		"stateMutability": "view",
+		"type": "function"
+	},
 	{
 		"constant": true,
 		"inputs": [],
@@ -631,6 +680,21 @@
 		"stateMutability": "view",
 		"type": "function"
 	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "bscChainID",
+		"outputs": [
+			{
+				"internalType": "uint16",
+				"name": "",
+				"type": "uint16"
+			}
+		],
+		"payable": false,
+		"stateMutability": "view",
+		"type": "function"
+	},
 	{
 		"constant": true,
 		"inputs": [
@@ -677,6 +741,27 @@
 		"stateMutability": "view",
 		"type": "function"
 	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"internalType": "address",
+				"name": "",
+				"type": "address"
+			}
+		],
+		"name": "currentValidatorSetMap",
+		"outputs": [
+			{
+				"internalType": "uint256",
+				"name": "",
+				"type": "uint256"
+			}
+		],
+		"payable": false,
+		"stateMutability": "view",
+		"type": "function"
+	},
 	{
 		"constant": false,
 		"inputs": [
@@ -763,12 +848,12 @@
 		"inputs": [
 			{
 				"internalType": "uint8",
-				"name": "",
+				"name": "channelId",
 				"type": "uint8"
 			},
 			{
 				"internalType": "bytes",
-				"name": "",
+				"name": "msgBytes",
 				"type": "bytes"
 			}
 		],
@@ -783,12 +868,12 @@
 		"inputs": [
 			{
 				"internalType": "uint8",
-				"name": "",
+				"name": "channelId",
 				"type": "uint8"
 			},
 			{
 				"internalType": "bytes",
-				"name": "",
+				"name": "msgBytes",
 				"type": "bytes"
 			}
 		],
@@ -848,21 +933,6 @@
 		"stateMutability": "nonpayable",
 		"type": "function"
 	},
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "previousDepositHeight",
-		"outputs": [
-			{
-				"internalType": "uint64",
-				"name": "",
-				"type": "uint64"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
 	{
 		"constant": true,
 		"inputs": [],

diff --git a/abi/crosschain.abi b/abi/crosschain.abi
@@ -30,7 +30,13 @@
 			{
 				"indexed": true,
 				"internalType": "uint64",
-				"name": "sequence",
+				"name": "oracleSequence",
+				"type": "uint64"
+			},
+			{
+				"indexed": true,
+				"internalType": "uint64",
+				"name": "packageSequence",
 				"type": "uint64"
 			},
 			{
@@ -161,6 +167,21 @@
 		"stateMutability": "view",
 		"type": "function"
 	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "CODE_OK",
+		"outputs": [
+			{
+				"internalType": "uint32",
+				"name": "",
+				"type": "uint32"
+			}
+		],
+		"payable": false,
+		"stateMutability": "view",
+		"type": "function"
+	},
 	{
 		"constant": true,
 		"inputs": [],
@@ -176,6 +197,21 @@
 		"stateMutability": "view",
 		"type": "function"
 	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "ERROR_FAIL_DECODE",
+		"outputs": [
+			{
+				"internalType": "uint32",
+				"name": "",
+				"type": "uint32"
+			}
+		],
+		"payable": false,
+		"stateMutability": "view",
+		"type": "function"
+	},
 	{
 		"constant": true,
 		"inputs": [],
@@ -236,6 +272,21 @@
 		"stateMutability": "view",
 		"type": "function"
 	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "INIT_BATCH_SIZE",
+		"outputs": [
+			{
+				"internalType": "uint256",
+				"name": "",
+				"type": "uint256"
+			}
+		],
+		"payable": false,
+		"stateMutability": "view",
+		"type": "function"
+	},
 	{
 		"constant": true,
 		"inputs": [],
@@ -329,7 +380,7 @@
 	{
 		"constant": true,
 		"inputs": [],
-		"name": "SYNC_PACKAGE",
+		"name": "SYN_PACKAGE",
 		"outputs": [
 			{
 				"internalType": "uint8",
@@ -431,6 +482,36 @@
 		"stateMutability": "view",
 		"type": "function"
 	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "batchSizeForOracle",
+		"outputs": [
+			{
+				"internalType": "uint256",
+				"name": "",
+				"type": "uint256"
+			}
+		],
+		"payable": false,
+		"stateMutability": "view",
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "bscChainID",
+		"outputs": [
+			{
+				"internalType": "uint16",
+				"name": "",
+				"type": "uint16"
+			}
+		],
+		"payable": false,
+		"stateMutability": "view",
+		"type": "function"
+	},
 	{
 		"constant": true,
 		"inputs": [
@@ -504,12 +585,7 @@
 			},
 			{
 				"internalType": "uint256",
-				"name": "syncRelayFee",
-				"type": "uint256"
-			},
-			{
-				"internalType": "uint256",
-				"name": "ackRelayFee",
+				"name": "relayFee",
 				"type": "uint256"
 			},
 			{
@@ -595,6 +671,42 @@
 		"stateMutability": "view",
 		"type": "function"
 	},
+	{
+		"constant": true,
+		"inputs": [],
+		"name": "oracleSequence",
+		"outputs": [
+			{
+				"internalType": "uint64",
+				"name": "",
+				"type": "uint64"
+			}
+		],
+		"payable": false,
+		"stateMutability": "view",
+		"type": "function"
+	},
+	{
+		"constant": true,
+		"inputs": [
+			{
+				"internalType": "uint256",
+				"name": "",
+				"type": "uint256"
+			}
+		],
+		"name": "packageCounterForEachHeight",
+		"outputs": [
+			{
+				"internalType": "uint256",
+				"name": "",
+				"type": "uint256"
+			}
+		],
+		"payable": false,
+		"stateMutability": "view",
+		"type": "function"
+	},
 	{
 		"constant": true,
 		"inputs": [
@@ -631,16 +743,11 @@
 			},
 			{
 				"internalType": "uint256",
-				"name": "syncRelayFee",
-				"type": "uint256"
-			},
-			{
-				"internalType": "uint256",
-				"name": "ackRelayFee",
+				"name": "relayFee",
 				"type": "uint256"
 			}
 		],
-		"name": "sendPackage",
+		"name": "sendSynPackage",
 		"outputs": [
 			{
 				"internalType": "bool",