reorder e2e test order

ci/Makefile

@@ -8,17 +8,19 @@ create-channel:
 	bash ~/tests/create-channel.sh
 	@echo "Channel created"
 
-token-transfer: upgrade-client
+token-transfer: create-channel
 	@echo "Transferring tokens..."
 	bash ~/tests/token-transfer.sh
 	@echo "Tokens transferred"
 
-upgrade-client: create-channel
-	@echo "Upgrading client..."
-	bash ~/tests/upgrade-client.sh
-	@echo "Client upgraded"
-
-grpc-service: upgrade-client
+grpc-service: token-transfer
 	@echo "Testing gRPC services..."
 	bash ~/tests/grpc-service.sh
 	@echo "gRPC services working"
+
+# This test halts `gaiad` at the end.
+# So, this must be the last test that involves `gaiad`.
+upgrade-client: token-transfer
+	@echo "Upgrading client..."
+	bash ~/tests/upgrade-client.sh
+	@echo "Client upgraded"