test: update test vectors to match latest specification

Author: Roasbeef

obfuscation.go

@@ -16,6 +16,7 @@ import (
 func onionObfuscation(sharedSecret [sha256.Size]byte,
 	data []byte) []byte {
 	obfuscatedData := make([]byte, len(data))
+
 	ammagKey := generateKey("ammag", sharedSecret)
 	streamBytes := generateCipherStream(ammagKey, uint(len(data)))
 	xor(obfuscatedData, data, streamBytes)
@@ -172,8 +173,8 @@ func NewOnionDeobfuscator(circuit *Circuit) *OnionDeobfuscator {
 // backward manner, starting from the node where error have occurred, so in
 // order to deobfuscate the error we need get all shared secret and apply
 // obfuscation in reverse order.
-func (o *OnionDeobfuscator) Deobfuscate(obfuscatedData []byte) (*btcec.PublicKey,
-	[]byte, error) {
+func (o *OnionDeobfuscator) Deobfuscate(obfuscatedData []byte) (*btcec.PublicKey, []byte, error) {
+
 	for i, sharedSecret := range generateSharedSecrets(o.circuit.PaymentPath,
 		o.circuit.SessionKey) {
 		obfuscatedData = onionObfuscation(sharedSecret, obfuscatedData)

obfuscation_test.go

@@ -89,100 +89,40 @@ var onionErrorData = []struct {
 			"fc031217e90770c328",
 		ammagKey: "2f36bb8822e1f0d04c27b7d8bb7d7dd586e032a3218b8d414a" +
 			"fbba6f169a4d68",
-		stream: "e9c975b07c9a374ba64fd9be3aae955e917d34d1fa33f2e90f53" +
-			"bbf4394713c6a8c9b16ab5f12fd45edd73c1b0c8b33002df3768" +
-			"01ff58aaa94000bf8a86f92620f343baef38a580102395ae3abf" +
-			"9128d1047a0736ff9b83d456740ebbb4aeb3aa9737f18fb4afb4" +
-			"aa074fb26c4d702f42968888550a3bded8c05247e045b866baef" +
-			"0499f079fdaeef6538f31d44deafffdfd3afa2fb4ca9082b8f1c" +
-			"465371a9894dd8c2",
-		obfuscatedData: "69b1e5a3e05a7b5478e6529cd1749fdd8c66da6f6db4" +
-			"2078ff8497ac4e117e91a8cb9168b58f2fd45edd73c1b0c8b330" +
-			"02df376801ff58aaa94000bf8a86f92620f343baef38a5801023" +
-			"95ae3abf9128d1047a0736ff9b83d456740ebbb4aeb3aa9737f1" +
-			"8fb4afb4aa074fb26c4d702f42968888550a3bded8c05247e045" +
-			"b866baef0499f079fdaeef6538f31d44deafffdfd3afa2fb4ca9" +
-			"082b8f1c465371a9894dd8c2",
+		stream:         "e9c975b07c9a374ba64fd9be3aae955e917d34d1fa33f2e90f53bbf4394713c6a8c9b16ab5f12fd45edd73c1b0c8b33002df376801ff58aaa94000bf8a86f92620f343baef38a580102395ae3abf9128d1047a0736ff9b83d456740ebbb4aeb3aa9737f18fb4afb4aa074fb26c4d702f42968888550a3bded8c05247e045b866baef0499f079fdaeef6538f31d44deafffdfd3afa2fb4ca9082b8f1c465371a9894dd8c243fb4847e004f5256b3e90e2edde4c9fb3082ddfe4d1e734cacd96ef0706bf63c9984e22dc98851bcccd1c3494351feb458c9c6af41c0044bea3c47552b1d992ae542b17a2d0bba1a096c78d169034ecb55b6e3a7263c26017f033031228833c1daefc0dedb8cf7c3e37c9c37ebfe42f3225c326e8bcfd338804c145b16e34e4",
+		obfuscatedData: "a5e6bd0c74cb347f10cce367f949098f2457d14c046fd8a22cb96efb30b0fdcda8cb9168b50f2fd45edd73c1b0c8b33002df376801ff58aaa94000bf8a86f92620f343baef38a580102395ae3abf9128d1047a0736ff9b83d456740ebbb4aeb3aa9737f18fb4afb4aa074fb26c4d702f42968888550a3bded8c05247e045b866baef0499f079fdaeef6538f31d44deafffdfd3afa2fb4ca9082b8f1c465371a9894dd8c243fb4847e004f5256b3e90e2edde4c9fb3082ddfe4d1e734cacd96ef0706bf63c9984e22dc98851bcccd1c3494351feb458c9c6af41c0044bea3c47552b1d992ae542b17a2d0bba1a096c78d169034ecb55b6e3a7263c26017f033031228833c1daefc0dedb8cf7c3e37c9c37ebfe42f3225c326e8bcfd338804c145b16e34e4",
 	},
 	{
 		sharedSecret: "21e13c2d7cfe7e18836df50872466117a295783ab8aab0e" +
 			"7ecc8c725503ad02d",
 		ammagKey: "cd9ac0e09064f039fa43a31dea05f5fe5f6443d40a98be4071" +
 			"af4a9d704be5ad",
-		stream: "617ca1e4624bc3f04fece3aa5a2b615110f421ec62408d16c48e" +
-			"a6c1b7c33fe7084a2bd9d4652fc5068e5052bf6d0acae2176018" +
-			"a3d8c75f37842712913900263cff92f39f3c18aa1f4b20a93e70" +
-			"fc429af7b2b1967ca81a761d40582daf0eb49cef66e3d6fbca02" +
-			"18d3022d32e994b41c884a27c28685ef1eb14603ea80a204b2f2" +
-			"f474b6ad5e71c6389843e3611ebeafc62390b717ca53b3670a33" +
-			"c517ef28a659c251",
-		obfuscatedData: "08cd44478211b8a4370ab1368b5ffe8c9c92fb830ff4" +
-			"ad6e3b0a316df9d24176a081bab161ea0011585323930fa5b9fa" +
-			"e0c85770a2279ff59ec427ad1bbff9001c0cd1497004bd2a0f68" +
-			"b50704cf6d6a4bf3c8b6a0833399a24b3456961ba00736785112" +
-			"594f65b6b2d44d9f5ea4e49b5e1ec2af978cbe31c67114440ac5" +
-			"1a62081df0ed46d4a3df295da0b0fe25c0115019f03f15ec86fa" +
-			"bb4c852f83449e812f141a93",
+		stream:         "617ca1e4624bc3f04fece3aa5a2b615110f421ec62408d16c48ea6c1b7c33fe7084a2bd9d4652fc5068e5052bf6d0acae2176018a3d8c75f37842712913900263cff92f39f3c18aa1f4b20a93e70fc429af7b2b1967ca81a761d40582daf0eb49cef66e3d6fbca0218d3022d32e994b41c884a27c28685ef1eb14603ea80a204b2f2f474b6ad5e71c6389843e3611ebeafc62390b717ca53b3670a33c517ef28a659c251d648bf4c966a4ef187113ec9848bf110816061ca4f2f68e76ceb88bd6208376460b916fb2ddeb77a65e8f88b2e71a2cbf4ea4958041d71c17d05680c051c3676fb0dc8108e5d78fb1e2c44d79a202e9d14071d536371ad47c39a05159e8d6c41d17a1e858faaaf572623aa23a38ffc73a4114cb1ab1cd7f906c6bd4e21b29694",
+		obfuscatedData: "c49a1ce81680f78f5f2000cda36268de34a3f0a0662f55b4e837c83a8773c22aa081bab1616a0011585323930fa5b9fae0c85770a2279ff59ec427ad1bbff9001c0cd1497004bd2a0f68b50704cf6d6a4bf3c8b6a0833399a24b3456961ba00736785112594f65b6b2d44d9f5ea4e49b5e1ec2af978cbe31c67114440ac51a62081df0ed46d4a3df295da0b0fe25c0115019f03f15ec86fabb4c852f83449e812f141a9395b3f70b766ebbd4ec2fae2b6955bd8f32684c15abfe8fd3a6261e52650e8807a92158d9f1463261a925e4bfba44bd20b166d532f0017185c3a6ac7957adefe45559e3072c8dc35abeba835a8cb01a71a15c736911126f27d46a36168ca5ef7dccd4e2886212602b181463e0dd30185c96348f9743a02aca8ec27c0b90dca270",
 	},
 	{
 		sharedSecret: "3a6b412548762f0dbccce5c7ae7bb8147d1caf9b5471c3" +
 			"4120b30bc9c04891cc",
 		ammagKey: "1bf08df8628d452141d56adfd1b25c1530d7921c23cecfc749" +
 			"ac03a9b694b0d3",
-		stream: "6149f48b5a7e8f3d6f5d870b7a698e204cf64452aab4484ff1de" +
-			"e671fe63fd4b5f1b78ee2047dfa61e3d576b149bedaf83058f85" +
-			"f06a3172a3223ad6c4732d96b32955da7d2feb4140e58d86fc0f" +
-			"2eb5d9d1878e6f8a7f65ab9212030e8e915573ebbd7f35e1a430" +
-			"890be7e67c3fb4bbf2def662fa625421e7b411c29ebe81ec67b7" +
-			"7355596b05cc155755664e59c16e21410aabe53e80404a615f44" +
-			"ebb31b365ca77a6e",
-		obfuscatedData: "6984b0ccd86f37995857363df13670acd064bfd1a540" +
-			"e521cad4d71c07b1bc3dff9ac25f41addfb7466e74f81b3e5455" +
-			"63cdd8f5524dae873de61d7bdfccd496af2584930d2b566b4f8d" +
-			"3881f8c043df92224f38cf094cfc09d92655989531524593ec6d" +
-			"6caec1863bdfaa79229b5020acc034cd6deeea1021c50586947b" +
-			"9b8e6faa83b81fbfa6133c0af5d6b07c017f7158fa94f0d206ba" +
-			"f12dda6b68f785b773b360fd",
+		stream:         "6149f48b5a7e8f3d6f5d870b7a698e204cf64452aab4484ff1dee671fe63fd4b5f1b78ee2047dfa61e3d576b149bedaf83058f85f06a3172a3223ad6c4732d96b32955da7d2feb4140e58d86fc0f2eb5d9d1878e6f8a7f65ab9212030e8e915573ebbd7f35e1a430890be7e67c3fb4bbf2def662fa625421e7b411c29ebe81ec67b77355596b05cc155755664e59c16e21410aabe53e80404a615f44ebb31b365ca77a6e91241667b26c6cad24fb2324cf64e8b9dd6e2ce65f1f098cfd1ef41ba2d4c7def0ff165a0e7c84e7597c40e3dffe97d417c144545a0e38ee33ebaae12cc0c14650e453d46bfc48c0514f354773435ee89b7b2810606eb73262c77a1d67f3633705178d79a1078c3a01b5fadc9651feb63603d19decd3a00c1f69af2dab259593",
+		obfuscatedData: "a5d3e8634cfe78b2307d87c6d90be6fe7855b4f2cc9b1dfb19e92e4b79103f61ff9ac25f412ddfb7466e74f81b3e545563cdd8f5524dae873de61d7bdfccd496af2584930d2b566b4f8d3881f8c043df92224f38cf094cfc09d92655989531524593ec6d6caec1863bdfaa79229b5020acc034cd6deeea1021c50586947b9b8e6faa83b81fbfa6133c0af5d6b07c017f7158fa94f0d206baf12dda6b68f785b773b360fd0497e16cc402d779c8d48d0fa6315536ef0660f3f4e1865f5b38ea49c7da4fd959de4e83ff3ab686f059a45c65ba2af4a6a79166aa0f496bf04d06987b6d2ea205bdb0d347718b9aeff5b61dfff344993a275b79717cd815b6ad4c0beb568c4ac9c36ff1c315ec1119a1993c4b61e6eaa0375e0aaf738ac691abd3263bf937e3",
 	},
 	{
 		sharedSecret: "a6519e98832a0b179f62123b3567c106db99ee37bef036" +
 			"e783263602f3488fae",
 		ammagKey: "59ee5867c5c151daa31e36ee42530f429c433836286e63744f" +
 			"2020b980302564",
-		stream: "0f10c86f05968dd91188b998ee45dcddfbf89fe9a99aa6375c42" +
-			"ed5520a257e048456fe417c15219ce39d921555956ae2ff79517" +
-			"7c63c819233f3bcb9b8b28e5ac6e33a3f9b87ca62dff43f4cc4a" +
-			"2755830a3b7e98c326b278e2bd31f4a9973ee99121c62873f5bf" +
-			"b2d159d3d48c5851e3b341f9f6634f51939188c3b9ff45feeb11" +
-			"160bb39ce3332168b8e744a92107db575ace7866e4b8f390f1ed" +
-			"c4acd726ed106555",
-		obfuscatedData: "669478a3ddf9ba4049df8fa51f73ac712b9c20380cda" +
-			"431696963a492713ebddb7dfadbb566c8dae8857add94e6702fb" +
-			"4c3a4de22e2e669e1ed926b04447fc73034bb730f4932acd6272" +
-			"7b75348a648a1128744657ca6a4e713b9b646c3ca66cac02cdab" +
-			"44dd3439890ef3aaf61708714f7375349b8da541b2548d452d84" +
-			"de7084bb95b3ac2345201d624d31f4d52078aa0fa05a88b4e202" +
-			"02bd2b86ac5b52919ea305a8",
+		stream:         "0f10c86f05968dd91188b998ee45dcddfbf89fe9a99aa6375c42ed5520a257e048456fe417c15219ce39d921555956ae2ff795177c63c819233f3bcb9b8b28e5ac6e33a3f9b87ca62dff43f4cc4a2755830a3b7e98c326b278e2bd31f4a9973ee99121c62873f5bfb2d159d3d48c5851e3b341f9f6634f51939188c3b9ff45feeb11160bb39ce3332168b8e744a92107db575ace7866e4b8f390f1edc4acd726ed106555900a0832575c3a7ad11bb1fe388ff32b99bcf2a0d0767a83cf293a220a983ad014d404bfa20022d8b369fe06f7ecc9c74751dcda0ff39d8bca74bf9956745ba4e5d299e0da8f68a9f660040beac03e795a046640cf8271307a8b64780b0588422f5a60ed7e36d60417562938b400802dac5f87f267204b6d5bcfd8a05b221ec2",
+		obfuscatedData: "aac3200c4968f56b21f53e5e374e3a2383ad2b1b6501bbcc45abc31e59b26881b7dfadbb56ec8dae8857add94e6702fb4c3a4de22e2e669e1ed926b04447fc73034bb730f4932acd62727b75348a648a1128744657ca6a4e713b9b646c3ca66cac02cdab44dd3439890ef3aaf61708714f7375349b8da541b2548d452d84de7084bb95b3ac2345201d624d31f4d52078aa0fa05a88b4e20202bd2b86ac5b52919ea305a8949de95e935eed0319cf3cf19ebea61d76ba92532497fcdc9411d06bcd4275094d0a4a3c5d3a945e43305a5a9256e333e1f64dbca5fcd4e03a39b9012d197506e06f29339dfee3331995b21615337ae060233d39befea925cc262873e0530408e6990f1cbd233a150ef7b004ff6166c70c68d9f8c853c1abca640b8660db2921",
 	},
 	{
 		sharedSecret: "53eb63ea8a3fec3b3cd433b85cd62a4b145e1dda09391b" +
 			"348c4e1cd36a03ea66",
 		ammagKey: "3761ba4d3e726d8abb16cba5950ee976b84937b61b7ad09e74" +
 			"1724d7dee12eb5",
-		stream: "3699fd352a948a05f604763c0bca2968d5eaca2b0118602e52e5" +
-			"9121f050936c8dd90c24df7dc8cf8f1665e39a6c75e9e2c0900e" +
-			"a245c9ed3b0008148e0ae18bbfaea0c711d67eade980c6f5452e" +
-			"91a06b070bbde68b5494a92575c114660fb53cf04bf686e67ffa" +
-			"4a0f5ae41a59a39a8515cb686db553d25e71e7a97cc2febcac55" +
-			"df2711b6209c502b2f8827b13d3ad2f491c45a0cafe7b4d8d881" +
-			"0e805dee25d676ce",
-		obfuscatedData: "500d8596f76d3045bfdbf99914b98519fe76ea130dc2" +
-			"2338c473ab68d74378b13a06a19f891145610741c83ad40b7712" +
-			"aefaddec8c6baf7325d92ea4ca4d1df8bce517f7e54554608bf2" +
-			"bd8071a4f52a7a2f7ffbb1413edad81eeea5785aa9d990f2865d" +
-			"c23b4bc3c301a94eec4eabebca66be5cf638f693ec256aec5146" +
-			"20cc28ee4a94bd9565bc4d4962b9d3641d4278fb319ed2b84de5" +
-			"b665f307a2db0f7fbb757366",
+		stream:         "3699fd352a948a05f604763c0bca2968d5eaca2b0118602e52e59121f050936c8dd90c24df7dc8cf8f1665e39a6c75e9e2c0900ea245c9ed3b0008148e0ae18bbfaea0c711d67eade980c6f5452e91a06b070bbde68b5494a92575c114660fb53cf04bf686e67ffa4a0f5ae41a59a39a8515cb686db553d25e71e7a97cc2febcac55df2711b6209c502b2f8827b13d3ad2f491c45a0cafe7b4d8d8810e805dee25d676ce92e0619b9c206f922132d806138713a8f69589c18c3fdc5acee41c1234b17ecab96b8c56a46787bba2c062468a13919afc18513835b472a79b2c35f9a91f38eb3b9e998b1000cc4a0dbd62ac1a5cc8102e373526d7e8f3c3a1b4bfb2f8a3947fe350cb89f73aa1bb054edfa9895c0fc971c2b5056dc8665902b51fced6dff80c",
+		obfuscatedData: "9c5add3963fc7f6ed7f148623c84134b5647e1306419dbe2174e523fa9e2fbed3a06a19f899145610741c83ad40b7712aefaddec8c6baf7325d92ea4ca4d1df8bce517f7e54554608bf2bd8071a4f52a7a2f7ffbb1413edad81eeea5785aa9d990f2865dc23b4bc3c301a94eec4eabebca66be5cf638f693ec256aec514620cc28ee4a94bd9565bc4d4962b9d3641d4278fb319ed2b84de5b665f307a2db0f7fbb757366067d88c50f7e829138fde4f78d39b5b5802f1b92a8a820865af5cc79f9f30bc3f461c66af95d13e5e1f0381c184572a91dee1c849048a647a1158cf884064deddbf1b0b88dfe2f791428d0ba0f6fb2f04e14081f69165ae66d9297c118f0907705c9c4954a199bae0bb96fad763d690e7daa6cfda59ba7f2c8d11448b604d12d",
 	},
 }
 
@@ -223,11 +163,7 @@ func getSpecSessionKey() (*btcec.PrivateKey, error) {
 }
 
 func getSpecOnionErrorData() ([]byte, error) {
-	sData := "00022002007e00000000000000000000000000000000000000000000000" +
-		"000000000000000000000000000000000000000000000000000000000000" +
-		"000000000000000000000000000000000000000000000000000000000000" +
-		"000000000000000000000000000000000000000000000000000000000000" +
-		"0000000000000000000000000"
+	sData := "0002200200fe0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
 	return hex.DecodeString(sData)
 }