flip order of rat_1 and rat_2, use new golden

algosdk/template.py

@@ -62,8 +62,8 @@ def get_program(self):
                 "EDMACCEFCzMBCCEGCxIQMwAIIQcPEBA=")
         orig = base64.b64decode(orig)
         offsets = [4, 7, 8, 9, 10, 14, 47, 80]
-        values = [self.max_fee, self.expiry_round, self.rat_1,
-                  self.rat_2, self.min_pay, self.owner,
+        values = [self.max_fee, self.expiry_round, self.rat_2,
+                  self.rat_1, self.min_pay, self.owner,
                   self.receiver_1, self.receiver_2]
         types = [int, int, int, int, int, "address", "address", "address"]
         return inject(orig, offsets, values, types)
@@ -88,11 +88,11 @@ def get_split_funds_transaction(contract, amount: int, fee: int, first_valid,
         _, ints, bytearrays = logic.read_program(contract)
         if not (len(ints) == 8 and len(bytearrays) == 3):
             raise error.WrongContractError("split")
-        rat_1 = ints[5]
-        rat_2 = ints[6]
+        rat_1 = ints[6]
+        rat_2 = ints[5]
         min_pay = ints[7]
-        receiver_1 = encoding.encode_address(bytearrays[0])
-        receiver_2 = encoding.encode_address(bytearrays[1])
+        receiver_1 = encoding.encode_address(bytearrays[1])
+        receiver_2 = encoding.encode_address(bytearrays[2])
 
         amt_1 = 0
         amt_2 = 0

test_unit.py

@@ -542,7 +542,7 @@ def test_group_id(self):
 
 class TestMnemonic(unittest.TestCase):
     def test_mnemonic_private_key(self):
-        priv_key, address = account.generate_account()
+        priv_key, _ = account.generate_account()
         mn = mnemonic.from_private_key(priv_key)
         self.assertEqual(len(mn.split(" ")), constants.mnemonic_len)
         self.assertEqual(priv_key, mnemonic.to_private_key(mn))
@@ -723,7 +723,7 @@ def test_errors(self):
 
         # get random private key
         private_key_1, account_1 = account.generate_account()
-        private_key_2, account_2 = account.generate_account()
+        _, account_2 = account.generate_account()
         private_key_3, account_3 = account.generate_account()
 
         # create transaction
@@ -1178,17 +1178,40 @@ def test_split(self):
         addr2 = "W6UUUSEAOGLBHT7VFT4H2SDATKKSG6ZBUIJXTZMSLW36YS44FRP5NVAU7U"
         addr3 = "XCIBIN7RT4ZXGBMVAMU3QS6L5EKB7XGROC5EPCNHHYXUIBAA5Q6C5Y7NEU"
         s = template.Split(addr1, addr2, addr3, 30, 100, 123456, 10000, 5000000)
-        golden = ("ASAIAcCWsQICAMDEBx5kkE4mAyCztwQn0+DycN+vsk+vJWcsoz/b7NDS" +
+        golden = ("ASAIAcCWsQICAMDEB2QekE4mAyCztwQn0+DycN+vsk+vJWcsoz/b7NDS" +
                   "6i33HOkvTpf+YiC3qUpIgHGWE8/1LPh9SGCalSN7IaITeeWSXbfsS5ws" +
                   "XyC4kBQ38Z8zcwWVAym4S8vpFB/c0XC6R4mnPi9EBADsPDEQIhIxASMM" +
                   "EDIEJBJAABkxCSgSMQcyAxIQMQglEhAxAiEEDRAiQAAuMwAAMwEAEjEJ" +
                   "MgMSEDMABykSEDMBByoSEDMACCEFCzMBCCEGCxIQMwAIIQcPEBA=")
-        golden_addr = "KPYGWKTV7CKMPMTLQRNGMEQRSYTYDHUOFNV4UDSBDLC44CLIJPQWRTCPBU"
+        golden_addr = "HDY7A4VHBWQWQZJBEMASFOUZKBNGWBMJEMUXAGZ4SPIRQ6C24MJHUZKFGY"
         self.assertEqual(s.get_program(), base64.b64decode(golden))
         self.assertEqual(s.get_address(), golden_addr)
-        txns = s.get_split_funds_transaction(s.get_program(), 130000, 10, 1234, 2234,
-                                     "f4OxZX/x/FO5LcGBSKHWXf" +
-                                     "wtSx+j1ncoSt3SABJtkGk=")
+        txns = s.get_split_funds_transaction(
+            s.get_program(), 1300000, 10000, 1, 100,
+            "f4OxZX/x/FO5LcGBSKHWXfwtSx+j1ncoSt3SABJtkGk=")
+        golden_txns = base64.b64decode(
+            "gqRsc2lngaFsxM4BIAgBwJaxAgIAwMQHZB6QTiYDILO3BCfT4PJw36+yT68lZy" +
+            "yjP9vs0NLqLfcc6S9Ol/5iILepSkiAcZYTz/Us+H1IYJqVI3shohN55ZJdt+xL" +
+            "nCxfILiQFDfxnzNzBZUDKbhLy+kUH9zRcLpHiac+L0QEAOw8MRAiEjEBIwwQMg" +
+            "QkEkAAGTEJKBIxBzIDEhAxCCUSEDECIQQNECJAAC4zAAAzAQASMQkyAxIQMwAH" +
+            "KRIQMwEHKhIQMwAIIQULMwEIIQYLEhAzAAghBw8QEKN0eG6Jo2FtdM4ABJPgo2" +
+            "ZlZc4AId/gomZ2AaJnaMQgf4OxZX/x/FO5LcGBSKHWXfwtSx+j1ncoSt3SABJt" +
+            "kGmjZ3JwxCBLA74bTV35FJNL1h0K9ZbRU24b4M1JRkD1YTogvvDXbqJsdmSjcm" +
+            "N2xCC3qUpIgHGWE8/1LPh9SGCalSN7IaITeeWSXbfsS5wsX6NzbmTEIDjx8HKn" +
+            "DaFoZSEjASK6mVBaawWJIylwGzyT0Rh4WuMSpHR5cGWjcGF5gqRsc2lngaFsxM" +
+            "4BIAgBwJaxAgIAwMQHZB6QTiYDILO3BCfT4PJw36+yT68lZyyjP9vs0NLqLfcc" +
+            "6S9Ol/5iILepSkiAcZYTz/Us+H1IYJqVI3shohN55ZJdt+xLnCxfILiQFDfxnz" +
+            "NzBZUDKbhLy+kUH9zRcLpHiac+L0QEAOw8MRAiEjEBIwwQMgQkEkAAGTEJKBIx" +
+            "BzIDEhAxCCUSEDECIQQNECJAAC4zAAAzAQASMQkyAxIQMwAHKRIQMwEHKhIQMw" +
+            "AIIQULMwEIIQYLEhAzAAghBw8QEKN0eG6Jo2FtdM4AD0JAo2ZlZc4AId/gomZ2" +
+            "AaJnaMQgf4OxZX/x/FO5LcGBSKHWXfwtSx+j1ncoSt3SABJtkGmjZ3JwxCBLA7" +
+            "4bTV35FJNL1h0K9ZbRU24b4M1JRkD1YTogvvDXbqJsdmSjcmN2xCC4kBQ38Z8z" +
+            "cwWVAym4S8vpFB/c0XC6R4mnPi9EBADsPKNzbmTEIDjx8HKnDaFoZSEjASK6mV" +
+            "BaawWJIylwGzyT0Rh4WuMSpHR5cGWjcGF5")
+        encoded_txns = b''
+        for txn in txns:
+            encoded_txns += base64.b64decode(encoding.msgpack_encode(txn))
+        self.assertEqual(encoded_txns, golden_txns)
 
     def test_HTLC(self):
         addr1 = "726KBOYUJJNE5J5UHCSGQGWIBZWKCBN4WYD7YVSTEXEVNFPWUIJ7TAEOPM"