rebase conflicts

client/asset/dcr/config.go

@@ -4,7 +4,6 @@
 package dcr
 
 import (
-	"context"
 	"fmt"
 	"path/filepath"
 
@@ -40,26 +39,7 @@ type walletConfig struct {
 	FeeRateLimit     float64 `ini:"feeratelimit"`
 	RedeemConfTarget uint64  `ini:"redeemconftarget"`
 	ActivelyUsed     bool    `ini:"special:activelyUsed"` //injected by core
-}
-
-// Config holds the parameters needed to initialize an RPC connection to a dcr
-// wallet. Default values are used for RPCListen and/or RPCCert if not set.
-type Config struct {
-	PrimaryAccount   string  `ini:"account"`
-	UnmixedAccount   string  `ini:"unmixedaccount"`
-	TradingAccount   string  `ini:"tradingaccount"`
-	RPCUser          string  `ini:"username"`
-	RPCPass          string  `ini:"password"`
-	RPCListen        string  `ini:"rpclisten"`
-	RPCCert          string  `ini:"rpccert"`
-	UseSplitTx       bool    `ini:"txsplit"`
-	FallbackFeeRate  float64 `ini:"fallbackfee"`
-	FeeRateLimit     float64 `ini:"feeratelimit"`
-	RedeemConfTarget uint64  `ini:"redeemconftarget"`
 	ApiFeeFallback   bool    `ini:"apifeefallback"`
-	// Context should be canceled when the application exits. This will cause
-	// some cleanup to be performed during shutdown.
-	Context context.Context `ini:"-"`
 }
 
 type rpcConfig struct {