Merge branch 'hotfix/FileTransferTest' into 'release'

Move wg for file transfer test

See merge request !459

cmd/version.go

@@ -18,7 +18,7 @@ import (
 )
 
 // Change this value to set the version for this build
-const currentVersion = "4.3.8"
+const currentVersion = "4.3.9"
 
 func Version() string {
 	out := fmt.Sprintf("Elixxir Client v%s -- %s\n\n", xxdk.SEMVER,

fileTransfer/connect/wrapper_test.go

@@ -137,7 +137,6 @@ func Test_FileTransfer_Smoke(t *testing.T) {
 							"\nsent:     %q\nreceived: %q",
 							fileData, receivedFile)
 					}
-					wg.Done()
 				}
 			}
 			err3 := m2.RegisterReceivedProgressCallback(
@@ -175,6 +174,8 @@ func Test_FileTransfer_Smoke(t *testing.T) {
 			fileSize := len(fileData)
 			sendTime := tr.Sub(sendStart)
 			fileSizeKb := float32(fileSize) * .001
+			wg.Done()
+
 			speed := fileSizeKb * float32(time.Second) / (float32(sendTime))
 			t.Logf("Completed receiving file %q in %s (%.2f kb @ %.2f kb/s).",
 				fileName, sendTime, fileSizeKb, speed)

fileTransfer/e2e/wrapper_test.go

@@ -137,7 +137,6 @@ func Test_FileTransfer_Smoke(t *testing.T) {
 							"\nsent:     %q\nreceived: %q",
 							fileData, receivedFile)
 					}
-					wg.Done()
 				}
 			}
 			err3 := m2.RegisterReceivedProgressCallback(
@@ -178,6 +177,7 @@ func Test_FileTransfer_Smoke(t *testing.T) {
 			speed := fileSizeKb * float32(time.Second) / (float32(sendTime))
 			t.Logf("Completed receiving file %q in %s (%.2f kb @ %.2f kb/s).",
 				fileName, sendTime, fileSizeKb, speed)
+			wg.Done()
 		}
 	}()
 

fileTransfer/groupChat/wrapper_test.go

@@ -122,7 +122,6 @@ func Test_FileTransfer_Smoke(t *testing.T) {
 							"\nsent:     %q\nreceived: %q",
 							fileData, receivedFile)
 					}
-					wg.Done()
 				}
 			}
 			err3 := m2.RegisterReceivedProgressCallback(
@@ -163,6 +162,7 @@ func Test_FileTransfer_Smoke(t *testing.T) {
 			speed := fileSizeKb * float32(time.Second) / (float32(sendTime))
 			t.Logf("Completed receiving file %q in %s (%.2f kb @ %.2f kb/s).",
 				fileName, sendTime, fileSizeKb, speed)
+			wg.Done()
 		}
 	}()
 

fileTransfer/manager_test.go

@@ -161,7 +161,6 @@ func Test_FileTransfer_Smoke(t *testing.T) {
 							"\nsent:     %q\nreceived: %q",
 							fileData, receivedFile)
 					}
-					wg.Done()
 				}
 			}
 			err3 := m2.RegisterReceivedProgressCallback(
@@ -202,6 +201,7 @@ func Test_FileTransfer_Smoke(t *testing.T) {
 			throughput := fileSizeKb * float64(time.Second) / (float64(sendTime))
 			t.Logf("Completed receiving file %q in %s (%.2f kb @ %.2f kb/s).",
 				fileName, sendTime, fileSizeKb, throughput)
+			wg.Done()
 
 			expectedThroughput := float64(params.MaxThroughput) * .001
 			delta := (math.Abs(expectedThroughput-throughput) /

xxdk/version_vars.go

 // Code generated by go generate; DO NOT EDIT.
 // This file was generated by robots at
-// 2022-11-14 23:15:18.806830082 +0000 UTC m=+0.010342227
+// 2022-11-17 09:17:30.057367592 -0800 PST m=+0.010667512
 
 package xxdk
 
-const GITVERSION = `6e5de435 Fix tests but maintain the message hash sanity check in the message buffer deserialization code`
-const SEMVER = "4.3.8"
+const GITVERSION = `9fae107a Fix race condition in FT wrapper_test (groupChat)`
+const SEMVER = "4.3.9"
 const DEPENDENCIES = `module gitlab.com/elixxir/client/v4
 
 go 1.19