multi: use mutex-guarded ShortChanID() on OpenChannel

htlcswitch/test_utils.go

@@ -324,7 +324,7 @@ func createTestChannel(alicePrivKey, bobPrivKey []byte,
 		RevocationStore:         shachain.NewRevocationStore(),
 		LocalCommitment:         aliceCommit,
 		RemoteCommitment:        aliceCommit,
-		ShortChanID:             chanID,
+		ShortChannelID:          chanID,
 		Db:                      dbAlice,
 		Packager:                channeldb.NewChannelPackager(chanID),
 		FundingTxn:              testTx,
@@ -343,7 +343,7 @@ func createTestChannel(alicePrivKey, bobPrivKey []byte,
 		RevocationStore:         shachain.NewRevocationStore(),
 		LocalCommitment:         bobCommit,
 		RemoteCommitment:        bobCommit,
-		ShortChanID:             chanID,
+		ShortChannelID:          chanID,
 		Db:                      dbBob,
 		Packager:                channeldb.NewChannelPackager(chanID),
 	}