update docs

doc/API.md

@@ -762,9 +762,11 @@ returns the current settings along with metrics on the renter's spending.
     }
   },
   "financialmetrics": {
-    "contractspending": "1234", // hastings
+    "contractfees":     "1234", // hastings
+    "contractspending": "1234", // hastings (deprecated, now totalallocated)
     "downloadspending": "5678", // hastings
     "storagespending":  "1234", // hastings
+    "totalallocated":   "1234", // hastings
     "uploadspending":   "5678", // hastings
     "unspent":          "1234"  // hastings
   },

doc/api/Renter.md

@@ -66,16 +66,23 @@ returns the current settings along with metrics on the renter's spending.
   // Metrics about how much the Renter has spent on storage, uploads, and
   // downloads.
   "financialmetrics": {
+    // Amount of money spent on contract fees, transaction fees and siafund fees.
+    "contractfees": "1234", // hastings
+
     // How much money, in hastings, the Renter has spent on file contracts,
     // including fees.
-    "contractspending": "1234", // hastings
+    "contractspending": "1234", // hastings, (deprecated, now totalallocated)
 
     // Amount of money spent on downloads.
     "downloadspending": "5678", // hastings
 
     // Amount of money spend on storage.
     "storagespending": "1234", // hastings
 
+    // Total amount of money that the renter has put into contracts. Includes
+    // spent money and also money that will be returned to the renter.
+    "totalallocated": "1234", // hastings
+
     // Amount of money spent on uploads.
     "uploadspending": "5678", // hastings
 

modules/renter.go

@@ -266,7 +266,7 @@ type ContractorSpending struct {
 	// StorageSpending is the money currently spent on storage.
 	StorageSpending types.Currency `json:"storagespending"`
 	// ContractSpending is the total amount of money that the renter has put
-	// into the contract, whether it's locked and the renter gets that money
+	// into contracts, whether it's locked and the renter gets that money
 	// back or whether it's spent and the renter won't get the money back.
 	TotalAllocated types.Currency `json:"totalallocated"`
 	// UploadSpending is the money currently spent on uploads.

siatest/testgroup.go

@@ -316,7 +316,7 @@ func synchronizationCheck(miner *TestNode, nodes map[*TestNode]struct{}) error {
 		return err
 	}
 	for node := range nodes {
-		err := Retry(100, 100*time.Millisecond, func() error {
+		err := Retry(600, 100*time.Millisecond, func() error {
 			ncg, err := node.ConsensusGet()
 			if err != nil {
 				return err