Merge branch 'fix'

Author: benma

backend/devices/bitbox02/keystore_simulator_test.go

@@ -341,7 +341,7 @@ func makeTx(t *testing.T, device *Device, recipient *maketx.OutputInfo) *btc.Pro
 	inputAddress2 := addresses.NewAccountAddress(configurations[2], types.Derivation{Change: false, AddressIndex: 0}, network, log)
 	changeAddress := addresses.NewAccountAddress(configurations[0], types.Derivation{Change: true, AddressIndex: 1}, network, log)
 
-	inputAddress3 := addresses.NewAccountAddress(configurations[3], signing.NewEmptyRelativeKeypath().Child(0, false).Child(0, false), network, log)
+	inputAddress3 := addresses.NewAccountAddress(configurations[3], types.Derivation{Change: false, AddressIndex: 0}, network, log)
 
 	prevTx := &wire.MsgTx{
 		Version: 2,
@@ -437,7 +437,7 @@ func TestSimulatorSignBTCTransactionSendSelfDifferentAccount(t *testing.T) {
 		cfg := makeConfig(t, device, signing.ScriptTypeP2WPKH, mustKeypath("m/84'/0'/1'"))
 		selfAddress := addresses.NewAccountAddress(
 			cfg,
-			signing.NewEmptyRelativeKeypath().Child(0, false).Child(0, false),
+			types.Derivation{Change: false, AddressIndex: 0},
 			network,
 			log)
 		proposedTransaction := makeTx(t, device, maketx.NewOutputInfo(selfAddress.PubkeyScript()))